added 'Empty junk' context menu to Junk folder.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@2640 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2010-07-29 08:24:58 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2010-07-29 08:24:58 +0000
commit: df251dcecf8247c46e37c25696a5722240e53bb5 (patch)
tree: 72eef7658b4cdc63c22fa619b8052f236636d717 /po
parent: 0f1a9464181978dff13728f940f98c05fcbdb859 (diff)
30 files changed, 11839 insertions, 10840 deletions
diff --git a/po/be.po b/po/be.po
index 6aca0215..608ec798 100644
--- a/po/be.po
+++ b/po/be.po
@@ -4,7 +4,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-02-22 15:22+0300\n"
 "Last-Translator: Mikalai Udodau <crom-a@tut.by>\n"
 "Language-Team: Belarusian <i18n@mova.org>\n"
@@ -316,7 +316,7 @@ msgstr ""
 "Файл `%s' ужо існуе.\n"
 "Нельга стварыць каталог."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -501,11 +501,11 @@ msgstr "Знайдзена: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Канфігурацыя запісаная.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Фільтр непажаданай пошты (ручны)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Фільтр непажаданай пошты"
 
@@ -649,7 +649,7 @@ msgstr ""
 "гэтай праграмай; калі гэтага не адбылося, напішыце ў Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -685,7 +685,7 @@ msgstr ""
 "Новыя паведамленні будуць правераны ў гэтым парадку. Пазначце\n"
 "ў слупку `G' акаунты, якія задзейнічаюць атрыманне лістоў праз `Атр. усе'"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -826,8 +826,8 @@ msgstr "Дадаць Адрас у Кнігу"
 msgid "Address"
 msgstr "Адрас"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Заўвагі"
 
@@ -835,32 +835,32 @@ msgstr "Заўвагі"
 msgid "Select Address Book Folder"
 msgstr "Выберыце каталог Адраснай кнігі"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Аўта-рэгістраваныя адрасы"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Ф_айл"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/Ф_айл/Новая Кн_іга"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/Ф_айл/Новы _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/Ф_айл/Новы _J-Pilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/Ф_айл/Новы сервер _LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -868,190 +868,190 @@ msgstr "/Ф_айл/Новы сервер _LDAP"
 msgid "/_File/---"
 msgstr "/Ф_айл/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/Ф_айл/_Рэдагаваць"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/Ф_айл/_Сцерці"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/Ф_айл/За_пісаць"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Ф_айл/Закры_ць"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Праца"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Праца/Капірава_ць"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Праца/_Ўставіць"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Адрас"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Адрас/_Новы Адрас"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Адрас/Новая Гру_па"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Адрас/Новы К_аталог"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Адрас/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Адрас/_Рэдагаваць"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Адрас/Сц_ерці"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Прылады"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Прылады/Імпартаваць файл _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Прылады/Імпартаваць файл _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Даведка"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Даведка/_Аб праграме"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/_Новы адрас"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Новая гру_па"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Новы к_аталог"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Сц_ерці"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Капіраваць"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/_Ўставіць"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адрасная кніга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Каталог"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Каму:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытая копія:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Сцерці"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Дадаць"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Пошук"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "Закры_ць"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Сцерці адрас(ы)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Сапраўды сцерці гэты адрас(ы)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1060,36 +1060,36 @@ msgstr ""
 "Ці сапраўды жадаеце сцерці каталог І ўсе адрасы ў `%s' ?\n"
 "Пры сціранні толькі каталога, адрасы будуць перанесены ў каталог-продак."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Сцерці каталог"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Толькі К_аталог"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Каталог _і адрас(ы)"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Сапраўды сцерці `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Новы карыстальнік, немагчыма запісаць індэксны файл."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Новы карыстальнік, немагчыма запісаць файлы адраснай кнігі."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Старая адрасная кніга паспяхова сканвертаваная."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1097,7 +1097,7 @@ msgstr ""
 "Старая адрасная кніга сканвертаваная,\n"
 "немагчыма запісаць новы індэксны файл адрасоў."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1105,7 +1105,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "створаны пусты файл новай адраснай кнігі."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1113,7 +1113,7 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу,\n"
 "немагчыма стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1121,15 +1121,15 @@ msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу\n"
 "і нельга стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Памылка канверсіі адраснай кнігі"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Канверсія адраснай кнігі"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1140,76 +1140,76 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Памылка адраснай кнігі"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адрасная кніга сканвертаваная, але нельга запісаць новы файл індэксу "
 "адрасоў."
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, створаны файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу, немагчыма стварыць файлы новай "
 "адраснай кнігі."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Немагчыма сканвертаваць адрасную кнігу і стварыць файлы новай адраснай кнігі."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Немагчыма прачытаць індэкс адрасу"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Памылка канверсіі Адраснай кнігі"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Канверсія Адраснай кнігі"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Інтэрфейс"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адрасная Кніга"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Асоба"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Адрас эл.пошты"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1221,11 +1221,11 @@ msgstr "Супольны адрас"
 msgid "Personal address"
 msgstr "Асабовы адрас"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Заўвага"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Папярэджанне"
 
@@ -1272,7 +1272,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Няма"
 
@@ -1288,8 +1288,8 @@ msgstr "/Дадаць..."
 msgid "/_Remove"
 msgstr "/Сц_ерці"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Ўласцівасці..."
 
@@ -1363,7 +1363,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Праца/А_ўтаперанос"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/Выгляд"
 
@@ -1612,7 +1612,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Нельга атрымаць частку складанага паведамлення."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Без Тэмы)"
 
@@ -1653,7 +1653,7 @@ msgstr "Насамрэч даслаць гэты ліст на наступны�
 msgid "From:"
 msgstr "Адпраўнік:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тэма:"
 
@@ -1804,7 +1804,7 @@ msgstr "тып MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Памер"
 
@@ -1933,28 +1933,28 @@ msgstr "Трэба ўказаць Назву і Значэнне."
 msgid "Edit Person Data"
 msgstr "Змяніць асабовыя даныя"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Паказваць Імя"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Прозвішча"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Імя"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Псеўданім"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Mail адрас"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Псеўданім"
 
@@ -2066,12 +2066,12 @@ msgstr "Рэдагаваць каталог"
 msgid "Input the new name of folder:"
 msgstr "Ўвядзіце новую назву каталога:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Новы каталог"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Ўвядзіце назву новага каталога:"
 
@@ -2088,7 +2088,7 @@ msgid "Edit JPilot Entry"
 msgstr "Змяніць запіс JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2271,193 +2271,199 @@ msgstr "Гэты файл ужо існуе. Жадаеце замяніць я�
 msgid "Select folder"
 msgstr "Выберыце каталог"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Атрыманыя"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Дасланыя"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Чарга"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Смецце"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чарнавікі"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Спам"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "НовыКаталог"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не можа быць уключана ў назву каталога."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Каталог `%s' ужо існуе."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Нельга стварыць каталог '%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/С_тварыць новы каталог..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Змяніць назву _каталога..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/Перанес_ьці каталог..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Сц_ерці каталог"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Ачысціць см_етніцу"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Ачысціць см_етніцу"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Праверыць новыя паведамленні"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Перасабраць дрэва ка_талогаў"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Абнавіць _зводку"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Пазначыць усе чытанымі"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/В_ыслаць паведамленні з чаргі"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Шукаць паведамленні..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Рэдагаваць умовы по_шуку..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Загрузіць"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Падп_ісацца на групу навін..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Сцерці групу навін"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Стварэнне прагляду каталогу...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Новы"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Нечытаны"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Агулам"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Устанаўленне інфармацыі па каталогу...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Устанаўленне інфармацыі па каталогу..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Прагляд каталога %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканаванне каталога %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Перасабраць дрэва каталога"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дрэва каталогаў будзе перасабрана. Працягваць?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Перазборка дрэва каталогаў..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Перазборка дрэва каталогаў схібіла."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Праверка новых паведамленняў ва ўсіх каталогах..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Спам"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Выбраны каталог %s\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загрузка паведамленняў з %s..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Загрузіць усе паведамленні з '%s' ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Загрузіць усе паведамленні"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Памылка пад час загрузкі паведамлення ў `%s'."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2467,26 +2473,26 @@ msgstr ""
 "(калі жадаеце стварыць каталог з мэтай размяшчэння ў ім\n"
 " падкаталогаў, дадайце `/' на канцы назвы)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Увядзіце новую назву для '%s' :"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Перайменаваць каталог"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Нельга перайменаваць каталог '%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Нельга перанесці каталог `%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2495,11 +2501,11 @@ msgstr ""
 "Сцерці каталог пошуку `%s' ?\n"
 "Самі паведамленні не будуць сцёртыя."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Сцерці каталог пошуку"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2512,20 +2518,30 @@ msgstr ""
 "\n"
 "Сапраўды жадаеце сцерці?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Нельга сцерці каталог '%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Ачысціць сметніцу"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Сцерці усе лісты з каталога-сметніцы?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Не-Спам"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Сцерці усе лісты з каталога-сметніцы?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2534,34 +2550,34 @@ msgstr ""
 "Сапраўды сцерці паштовую скрынку `%s' ?\n"
 "(Паведамленні НЕ будуць сцёртыя з дыска)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Сцерці скрынку"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Сапраўды сцерці IMAP4-акаунт `%s'?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Сцерці IMAP4-акаунт"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Сапраўды сцерці групу навін `%s'?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Сцерці групу навін"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Сапраўды сцерці акаунт навін `%s'?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Сцерці акаунт навін"
 
@@ -2574,7 +2590,7 @@ msgid "Creating header view...\n"
 msgstr "Стварэнне прагляду загалоўкаў...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Без Адпраўніка)"
 
@@ -2643,112 +2659,112 @@ msgstr "Выберыце каталог імпарту"
 msgid "Select importing file"
 msgstr "Выберыце імпартаваны файл"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Укажыце назву адраснай кнігі і які файл імпартаваць."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Выберыце і ўпарадкуйце назвы палёў LDIF, якія імпартаваць."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Файл імпартаваны."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Выберыце файл."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Мусіць быць указаная назва адраснай кнігі."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Памылка чытання палёў CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Файл CSV паспяхова імпартаваны."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Выберыце файл CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Назва файла"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Раздзельнікі-кропкі"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Раздзельнікі-табы"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Поле CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Поле Адраснай кнігі:"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Упарадкуйце палі адраснай кнігі кнопкамі Вышэй і Ніжэй."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Вышэй"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Ніжэй"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Адрасная Кніга :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Назва файла:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Запісы :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Імпарт файла CSV у адрасную кнігу"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Наступны"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Папярэдні"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Інфармацыя па файлу"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Палі"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Завяршыць"
 
@@ -2926,7 +2942,7 @@ msgstr "Адлучэнне"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Атрыманне ліста (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3021,16 +3037,16 @@ msgstr "Увядзіце пароль"
 msgid "Protocol log"
 msgstr "Журнал пратакола"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Ужыванне: %s [ОПЦЫЯ]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрас]      адкрыць акно напісання паведамлення"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3040,23 +3056,23 @@ msgstr ""
 "                         адкрыць акно напісання паведамлення з далучаным\n"
 "                         дадаткам з азначанага файла (файлаў)"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              атрымаць новую пошту"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          атрымаць новую пошту для ўсіх акаунтаў"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 выслаць усе паведамленні з чаргі"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [каталог]...  паказаць агульную колькасць паведамленняў"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3064,45 +3080,45 @@ msgstr ""
 "  --status-full [каталог]...\n"
 "                         паказаць статус кожнага каталога"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open id_каталога/нум_ліста адкрыць паведамленне ў новым акне"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir dirname    задаць каталог з файламі канфігурацыі"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport нум_порта    задаць порт для аддаленых загадаў IPC"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 выйсці з Сілфіда"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                рэжым адладкі"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 паказаць гэту даведку і выйсці"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              паказаць звесткі пра версію і выйсці"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Націсніце любую клавішу..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Кадаванне імён файлаў"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3126,19 +3142,19 @@ msgstr ""
 "\n"
 "Працягваць?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Паведамленне ў працэсе напісання. Сапраўды выйсці?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Лісты ў чарзе"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "У чарзе засталіся недасланыя паведамленні. Выйсці зараз?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3146,20 +3162,20 @@ msgstr ""
 "Праграма GnuPG не устаноўлена як след, ці яе версія надта старая.\n"
 "Падтрымка OpenPGP адключаная."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Загрузка плагінаў..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "другі экземпляр Сілфіда ужо выконваецца.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Міграцыя канфігурацыі"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3501,15 +3517,15 @@ msgstr "/Выгляд/Знаказбор/Кітайскі (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Выгляд/Знаказбор/Карэйскі (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/Выгляд/Адкры_ць у новым акне"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/Выгляд/Выточны тэкст паведамлення"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/Выгляд/Усе загалоўкі"
 
@@ -3808,8 +3824,8 @@ msgstr "Стварэнне галоўнага вакна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: размяшчэнне колеру %d схібіла\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "зроблена.\n"
 
@@ -3877,7 +3893,7 @@ msgstr "Сілфід - Прагляд Каталогаў"
 msgid "Sylpheed - Message View"
 msgstr "Сілфід - Прагляд Паведамлення"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/Ад_казаць"
 
@@ -3893,15 +3909,15 @@ msgstr "/Адказаць адпраўніку"
 msgid "/Reply to mailing _list"
 msgstr "/А_дказаць у спіс рассылкі"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Пер_аправіць"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Перасла_ць як дадатак"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Перанакіраваць"
 
@@ -3945,19 +3961,19 @@ msgstr "Выйсці з праграмы?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Выберыце каталог"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Опцыі загаднага радка"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Ужыванне: sylpheed [ОПЦЫЯ]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3987,7 +4003,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4017,15 +4033,15 @@ msgstr ""
 "паказаць гэту даведку і выйсці\n"
 "паказаць звесткі пра версію і выйсці"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport нум_порта    задаць порт для аддаленых загадаў IPC"
@@ -4083,7 +4099,7 @@ msgstr "Дадаткі"
 msgid "Message View - Sylpheed"
 msgstr "Прагляд паведамлення - Сілфід"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Нельга запісаць файл `%s'."
@@ -4104,7 +4120,7 @@ msgstr "/Запісаць як..."
 msgid "/Save _all..."
 msgstr "/Запісаць усе..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Друкаваць..."
 
@@ -4494,7 +4510,7 @@ msgstr "Непасрэдны ўвод"
 msgid "Command output"
 msgstr "Вывад загада"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Аўтаматычна ўпісваць наступныя адрасы"
 
@@ -4746,7 +4762,7 @@ msgstr " Даведка па сінтаксісу "
 msgid "Registered actions"
 msgstr "Зарэгістраваныя дзеянні"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Новы)"
 
@@ -6099,28 +6115,28 @@ msgstr "Тып"
 msgid "Normal"
 msgstr "Звычайны"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Не паказваць [...] ці (...) ў пачатку тэмы ў зводцы"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Прыбіраць [...] або (...) у пачатку тэмы пры адказе"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Ужываць да падкаталогаў"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "ужываць таксама пры адказе"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Зваротны адрас:"
 
@@ -6156,19 +6172,19 @@ msgstr "Дадатак"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Тэма"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Адпраўнік"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Дата"
 
@@ -6178,7 +6194,7 @@ msgid "Number"
 msgstr "Нумар"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Каму"
 
@@ -6198,43 +6214,61 @@ msgstr ""
 "Выберыце элементы, паказаныя у выглядзе зводкі.\n"
 "Можна змяніць іх парадак кнопкамі Вышэй / Ніжэй."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Назва шаблона"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Рэгістраваць"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Замяніць "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Сімвалы "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Зарэгістраваныя шаблоны"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Назва шаблона"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Назва шаблона"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Памылка фармату шаблона."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Сцерці шаблон"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Сапраўды жадаеце сцерці гэты шаблон?"
 
@@ -6468,7 +6502,7 @@ msgstr "Пошук %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Пошук %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Без Даты)"
 
@@ -6565,7 +6599,7 @@ msgstr "_Аб праграме"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Адлеглая скрынка POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Нум."
 
@@ -7125,7 +7159,7 @@ msgstr "Атрыманне спісу груп навін..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Немагчыма атрымаць спіс груп навін."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Зроблена."
 
@@ -7134,360 +7168,360 @@ msgstr "Зроблена."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d груп навін атрымана (%s прачытана)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Адказаць"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Адказаць/ўсім"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Адказаць/адпраўніку"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Адказаць/у спіс рассылкі"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Пе_ранесці..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Капіраваць..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Марка"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Марка/_Маркіраваць"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Марка/_Зняць марку"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Марка/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Марка/Пазначыць як нечытаны"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Марка/Пазначыць як прачытаны"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Марка/Пазначыць нітку як чытаную"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Марка/Пазначыць усе чытанымі"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Каляровая метка"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Пазначыць як спам"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Пазначыць як не-спам"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Пера-рэдагаваць"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Дадаць адпраўніка да кнігі адрасоў..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Стварыць правіла фільтра"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Стварыць правіла фільтра/А_ўтаматычна"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Стварыць правіла фільтра/па _Адпраўніку"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Стварыць правіла фільтра/па А_драсату"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Стварыць правіла фільтра/па _Тэме"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Стварэнне прагляду зводкі...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Сканаванне каталога (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Апрацаваць пазначанні"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Некаторыя пазначанні засталіся. Апрацаваць?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Сканаванне каталога (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Немагчыма устанавіць злучэнне IMAP4.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "Шукаць яшчэ"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Нечытаных лістоў больш няма"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Нечытаных паведамленняў не знойдзена.\n"
 "Шукаць ад канца?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Няма нечытаных паведамленняў."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Нечытаных паведамленняў не знойдзена.\n"
 "Перайсці да наступнага каталога?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Новых паведамленняў больш няма"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Новых паведамленняў не знойдзена.\n"
 "Шукаць ад канца?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Няма новых паведамленняў."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Новых паведамленняў не знойдзена.\n"
 "Перайсці ў наступны каталог?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Няма болей маркіраваных паведамленняў"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Не знойдзена маркіраваных паведамленняў.\n"
 "Паўтарыць пошук ад канца?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Няма маркіраваных паведамленняў."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Не знойдзена маркіраваных паведамленняў.\n"
 "Паўтарыць пошук ад пачатку?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Няма болей памечаных паведамленняў"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Не знойдзена памечаных паведамленняў.\n"
 "Паўтарыць пошук ад канца?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Няма памечаных паведамленняў."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Не знойдзена памечаных паведамленняў.\n"
 "Паўтарыць пошук ад пачатку?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Сцягванне паведамленняў па тэме..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d сцёрта"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перанесена"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скапіравана"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " элемент(ы) вылучаны"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d нечытаных, агулам %d (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d нечытаных, %d агулам"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Упарадкаванне зводкі..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tВызначэнне зводкі з дадзеных паведамленняў..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Вызначэнне зводкі з дадзеных паведамлення..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запісанне кэшу зводкі (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Паведамленне %d маркіраванае\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Паведамленне %d маркіраванае як чытанае\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Паведамленне %d маркіраванае як нечытанае\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Паведамленне %s/%d пазначанае да сцірання\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Сцерці паведамленне(і)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Сапраўды жадаеце сцерці паведамленне(і) са сметніцы?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Сціранне падвоеных паведамленняў..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Паведамленне %s/%d размаркіраванае\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Паведамленне %d пазначанае да пераносу ў %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Каталог прызначэння супадае з бягучым."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Выберыце каталог для пераносу"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Паведамленне %d пазначанае да капіравання ў %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Каталог прызначэння копіі супадае з бягучым."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Выберыце каталог для капіравання"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Памылка падчас апрацоўкі паведамленняў."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Зборка нітак..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Разгрупаванне..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтраванне (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "фільтраванне..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Фільтраванне..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d ліст(ы) прафільтраваны."
diff --git a/po/bg.po b/po/bg.po
index ecd475bd..2089db48 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -321,7 +321,7 @@ msgstr ""
 "Файлът `%s' вече съществува.\n"
 "Папката не може да се създаде."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -501,12 +501,12 @@ msgstr "Намерени %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройките са запазени.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Папка"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Папка"
@@ -650,7 +650,7 @@ msgstr ""
 "програмата; в случай, че не сте, обърнете се към Free Software Foundation, "
 "Inc.,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -688,7 +688,7 @@ msgstr ""
 "За нови съобщения ще бъде проверявано в този ред. Отметнете кутийките\n"
 "в колонка `G' за разрешаване на изтегляне на съобщенията от `Get All'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -831,8 +831,8 @@ msgstr "Добавяне на Адреса към Книгата"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Забележки"
 
@@ -840,34 +840,34 @@ msgstr "Забележки"
 msgid "Select Address Book Folder"
 msgstr "Изберете папка от адресната книга"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Регистрирани правила"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Файл"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Файл/Нова _Книга"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Файл/Нова _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Файл/Нов _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Файл/Нов _Сървър"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -875,196 +875,196 @@ msgstr "/_Файл/Нов _Сървър"
 msgid "/_File/---"
 msgstr "/_Файл/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Файл/_Редактиране"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Файл/_Изтриване"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_файл/_Запазване"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Файл/_Затваряне"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Редактиране/_Копиране"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Адрес"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Адрес/Нов _Адрес"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Адрес/Нова _Група"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Адрес/Нова _Папка"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Адрес/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Адрес/_Редактиране"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Адрес/_Изтриване"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Инструменти"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Инструменти/Внасяне на _LDIF файл"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Помощ"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Помощ/_Относно"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Нов _Адрес"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Нова _Група"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Копиране..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Редактиране/_Вмъкване"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-Mail адрес"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Търсене"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Изтриване"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Добавяне"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Търсене"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Затваряне"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Изтриване на адрес(ите)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Желаете ли изтриване на адрес(ите)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1074,38 +1074,38 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Само папка"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Папка и Адреси"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Желаете ли изтриване на `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Нов потребител, не можа да ce запази индексния файл."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Нов потребител, не можа да се запази файла на адресната книга"
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Старата адресна книга конвертирана успешно"
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1113,7 +1113,7 @@ msgstr ""
 "Старата адресна книга конвертирана,\n"
 "не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1121,7 +1121,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга,\n"
 "създадени са нови празни файлове на адресната книга."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1137,17 +1137,17 @@ msgstr ""
 "Неуспя конвертирането на адресната книга\n"
 "и създаване на нови файлове на адресната книга."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1155,80 +1155,80 @@ msgid ""
 "%s%c%s"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Грешка на адресната книга"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старата адресна книга конвертирана, не може да се запази новия индексен файл"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, създадени са нови празни файлове "
 "на адресната книга."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга, неуспя създаване на нови файлове "
 "на адресната книга."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Неуспя конвертирането на адресната книга и създаване на нови файлове на "
 "адресната книга."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Не може да се прочете адресния индекс"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Грешка при конвертиране на адресната книга"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Конвертиране на адресната книга"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Лице"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "EMail Адрес"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP сървър"
 
@@ -1240,11 +1240,11 @@ msgstr "Публичен адрес"
 msgid "Personal address"
 msgstr "Личен адрес"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Забележка"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -1291,7 +1291,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Никой"
 
@@ -1307,8 +1307,8 @@ msgstr "/_Добавяне"
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
@@ -1388,7 +1388,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Изглед"
 
@@ -1672,7 +1672,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
@@ -1716,7 +1716,7 @@ msgstr "Автоматично установяване на следните а
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -1864,7 +1864,7 @@ msgstr "MIME тип"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Размер"
 
@@ -1996,28 +1996,28 @@ msgstr "Име и Стойност трябва да бъдат попълнен
 msgid "Edit Person Data"
 msgstr "Редактиране на данни за лице"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Екранно Име"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Име"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Прякор"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Mail адрес"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Псевдоним"
 
@@ -2131,12 +2131,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2153,7 +2153,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактиране на JPilot запис"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2346,200 +2346,206 @@ msgstr ""
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Създаване на _нова папка..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Преименуване на папка..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Преименуване на папка..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Изтриване на папка"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Изчистване на кошчето"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/_Маркиране/Маркиране като _прочетено"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Търсене на съобщения..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Няма непрочетени съобщения."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Записване в новинарска група"
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Премахване на новинарска група"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Създаване на изглед на папка...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Нови"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Непрочетени"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Установяване информация за папка...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Възобновяване дървото на папката"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дървото на папката ще бъде възобновено. Продължане?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Възобновяване дървото на папката..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2549,26 +2555,26 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2577,12 +2583,12 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2593,21 +2599,31 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Тема"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Желаете ли изчистване на кошчето?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2616,34 +2632,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2656,7 +2672,7 @@ msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -2736,120 +2752,120 @@ msgstr "Изберете файл за внасяне"
 msgid "Select importing file"
 msgstr "Изберете файл за внасяне"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Укажете име на адресна книга и файл за внасяне."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Избор и преименуване на LDIF имена на полета за внасяне."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Файлът е внесен."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Изберете файл."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Трябва да бъде попълнено име на адресна книга."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Грешка при четене на LDIF полета."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF файла е внесен успешно."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Избор на vCard файл"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Име на файл"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF поле"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Адресна книга :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Нагоре"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Надолу"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Адресна книга :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Име на файл :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Записи :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Внасяне на LDIF файл в Адресната книга"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Следващ"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Предишен"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Информация за файл"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF поле"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Завършване"
 
@@ -3030,7 +3046,7 @@ msgstr "Прекъсване"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получаване на съобшение (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3124,16 +3140,16 @@ msgstr "Въведете парола"
 msgid "Protocol log"
 msgstr "Протоколен журнал"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr " --compose [адрес]    отваряне на прозорец за съставяне"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3143,23 +3159,23 @@ msgstr ""
 "                         отваряне на прозорец за съставяне с прикрепени\n"
 "                         указаните файлове."
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive             получаване на нови съобщения"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all\t     получаване на нови съобщения от всички акаунти"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 изпращане на всички съобщения в опашката"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...   показване на пълния брой на съобщения"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3167,50 +3183,50 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         показване на състоянието на всяка папка"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим на дебъг"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr ""
 "  --help                 извеждане на тази помощна информация и излизане"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              извеждане на версията и излизане"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "или натиснете бутона `y'.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Изходяща кодова таблица"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3224,20 +3240,20 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Съставя се ново съобщение. Желаете ли изход от програмата?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Съобщения в опашката"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Някои неизпратени съобщения са в опашката. Желаете ли изход от програмата?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3245,21 +3261,21 @@ msgstr ""
 "GnuPG не е инсталиран правилно, или версията му е твърде стара.\n"
 "OpenPGP поддръжката е отменена."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "друг Sylpheed е стартиран вече.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Конфигурация на действия"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3627,15 +3643,15 @@ msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Изглед/_Цялата заглавна част"
@@ -3953,8 +3969,8 @@ msgstr "Създаване на главен прозорец...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -4025,7 +4041,7 @@ msgstr "Sylpheed - Изглед на папките"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Отговор"
 
@@ -4044,15 +4060,15 @@ msgstr "/Отговор _до/_подател"
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
@@ -4099,22 +4115,22 @@ msgstr "Желаете ли изход от програмата?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Избор на папка"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Не е въведен команден ред."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Употреба: %s [ОПЦИЯ]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4131,7 +4147,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4148,15 +4164,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4213,7 +4229,7 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
@@ -4235,7 +4251,7 @@ msgstr "/_Запазване като..."
 msgid "/Save _all..."
 msgstr "/_Запазване като..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Печат..."
 
@@ -4648,7 +4664,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Изход на команда"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Автоматично установяване на следните адреси"
 
@@ -4905,7 +4921,7 @@ msgstr " Помощ за синтаксиса"
 msgid "Registered actions"
 msgstr "Регистрирани действия"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Нов)"
 
@@ -6337,28 +6353,28 @@ msgstr "Тип"
 msgid "Normal"
 msgstr "Нормална"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Без показване на [...] или (...) в началото на тема в извадката"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Изтриване на [...] или (...) в началото на тема при отговор"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Акаунт"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Прилагане към подпапки"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "използване и при отговор"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -6397,19 +6413,19 @@ msgstr "Притурка"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Дата"
 
@@ -6419,7 +6435,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "До:"
@@ -6442,43 +6458,61 @@ msgstr ""
 "да променяте подреждането чрез бутоните Нагоре/Надолу, или чрез влачене на "
 "атрибутите."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Име на шаблон"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Регистриране"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr "Замяна"
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Символи "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Регистрирани шаблони"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Шаблони"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Име на шаблон"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Име на шаблон"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Грешка във формата на шаблона."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Изтриване на шаблона"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Желаете ли да изтриете шаблонът?"
 
@@ -6728,7 +6762,7 @@ msgstr "Филтриране..."
 msgid "Searching %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
@@ -6836,7 +6870,7 @@ msgstr "Относно"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "No."
 
@@ -7402,7 +7436,7 @@ msgstr "Не може да се получи списък на новинарс�
 msgid "Can't retrieve newsgroup list."
 msgstr "Не може да се получи списък на новинарската група"
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Изпълнено."
 
@@ -7411,352 +7445,352 @@ msgstr "Изпълнено."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d новинарски групи получени (%s прочетени)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Отговор _до"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Отговор _до/_всички"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Пре_местване..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Копиране..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Маркиране"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Маркиране/_Маркиране"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Маркиране/_Размаркиране"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Маркиране/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Маркиране/Маркиране като _непрочетено"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Маркиране/Маркиране като _прочетено"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Маркиране/Маркиране като _прочетено"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Маркиране/Маркиране на _всички като прочетени"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Цветен _етикет"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Установяване като подразбиращ се"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Ре_дактиране "
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Създаване на _правило за филтриране"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Създаване на _правило за филтриране/_Автоматично"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Създаване на _правило за филтриране/по _подател"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Създаване на _правило за филтриране/по п_олучател"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Създаване на _правило за филтриране/по _тема"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Създаване на изглед на извадката...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Сканиране на папка (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Обработване на маркер"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Има останали маркери. Желаете ли да се обработят?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Сканиране на папка (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Търсене отново"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Няма повече непрочетени съобщения"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Не е намерено непрочетено съобщение. Търсене от края?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Няма непрочетени съобщения."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Не е намерено непрочетено съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Няма повече нови съобщения"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Не е намерено ново съобщение. Търсене от края?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Няма нови съобщения."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Не е намерено ново съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Няма повече маркирани съобщения"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Не е намерено маркирано съобщение. Търсене от края?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Няма маркирани съобщения."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не е намерено маркирано съобщение. Търсене от началото?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Не е намерено съобщение с етикет. Търсене от края?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Няма съобщения с етикет"
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не е намерено съобщение с етикет. Търсене от началото?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Събиране на съобщения по тема..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d изтрити"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d преместени"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копирани"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr "избран(и)"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нови, %d непрочетени, %d общо (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нови, %d непрочетени, %d общо"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Избор на папка"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Избор на папка"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index e2cbaea7..ba681225 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-02-18 23:39+0100\n"
 "Last-Translator: Petr Kovar <pknbe@volny.cz>\n"
 "Language-Team: Petr Kovar <pknbe@volny.cz>\n"
@@ -324,7 +324,7 @@ msgstr ""
 "Soubor \"%s\" již existuje.\n"
 "Složku nelze vytvořit."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -509,11 +509,11 @@ msgstr "Nalezeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nastavení je uloženo.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Filtr nevyžádané pošty (ruční)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Filtr nevyžádané pošty"
 
@@ -657,7 +657,7 @@ msgstr ""
 "programem; pokud se tak nestalo, napište o ni Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -693,7 +693,7 @@ msgstr ""
 "Nové zprávy budou kontrolovány v uvedeném pořadí. Pokud má být účet\n"
 "kontrolován při volbě \"Přijmout vše\", zaškrtněte políčko ve sloupci \"G\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -834,8 +834,8 @@ msgstr "Přidat adresu do adresáře"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -843,32 +843,32 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vybrat složku adresáře"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Automaticky registrovaná adresa"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Soubor"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Soubor/Nový _adresář"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Soubor/Nová _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Soubor/Nový _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Soubor/Nový server _LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -876,190 +876,190 @@ msgstr "/_Soubor/Nový server _LDAP"
 msgid "/_File/---"
 msgstr "/_Soubor/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Soubor/Up_ravit"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Soubor/_Smazat"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Soubor/_Uložit"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Soubor/_Zavřít"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovat"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/V_ložit"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _adresa"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _skupina"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nová s_ložka"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresa/--"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/U_pravit"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/S_mazat"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovat soubor _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovat soubor _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_věda"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_věda/_O aplikaci"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nová _adresa"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nová skup_ina"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Smazat"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Kopírovat"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/_Vložit"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresář"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Složka"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Hledat:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Příjemce:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skrytá kopie:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Smazat"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Přidat"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Hledat"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Zavřít"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Smazat adresy"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Opravdu chcete smazat tyto adresy?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1068,36 +1068,36 @@ msgstr ""
 "Chcete smazat složku A všechny adresy v \"%s\"?\n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Smazat složku"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Pouz_e složku"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Složk_u a adresy"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Opravdu smazat \"%s\"?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nový uživatel, nelze uložit soubor index."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Nový uživatel, nelze uložit soubory s adresářem."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Konverze starého adresáře proběhla úspěšně."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1105,7 +1105,7 @@ msgstr ""
 "Starý adresář převeden,\n"
 "ale nelze uložit nový soubor s indexem."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1113,7 +1113,7 @@ msgstr ""
 "Konverze adresáře nemohla být provedena,\n"
 "ale byly vytvořeny nové prázdné soubory adresáře."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1121,7 +1121,7 @@ msgstr ""
 "Nelze provést konverzi adresáře,\n"
 "nelze vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1129,15 +1129,15 @@ msgstr ""
 "Nelze provést konverzi adresáře\n"
 "a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1148,72 +1148,72 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Chyba v adresáři"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr "Starý adresář převeden, ale nelze uložit nový soubor index s adresářem"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Konverze adresáře nemohla být provedena, ale byly vytvořeny nové prázdné "
 "soubory adresáře."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Nelze provést konverzi adresáře a vytvořit nové soubory adresáře."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Nelze načíst index adres"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Chyba při konverzi adresáře"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Konverze adresáře"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Rozhraní"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresář"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1225,11 +1225,11 @@ msgstr "Obecné adresy"
 msgid "Personal address"
 msgstr "Osobní adresy"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Poznámka"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Varování"
 
@@ -1276,7 +1276,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Nespecifikováno"
 
@@ -1292,8 +1292,8 @@ msgstr "/_Přidat..."
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -1367,7 +1367,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/A_utomatické zarovnávání"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/Z_obrazit"
 
@@ -1616,7 +1616,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nelze získat část ze zprávy s více částmi."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez předmětu)"
 
@@ -1657,7 +1657,7 @@ msgstr "Opravdu odeslat tuto zprávu na následující adresy?"
 msgid "From:"
 msgstr "Odesílatel:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Předmět:"
 
@@ -1808,7 +1808,7 @@ msgstr "Typ MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Velikost"
 
@@ -1938,28 +1938,28 @@ msgstr "Je nutné zadat jméno a hodnotu."
 msgid "Edit Person Data"
 msgstr "Upravit data o osobě"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Zobrazované jméno"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Příjmení"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Křestní jméno"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Přezdívka"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2072,12 +2072,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte prosím nový název složky:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Zadejte prosím název nové složky:"
 
@@ -2094,7 +2094,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upravit záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2277,193 +2277,199 @@ msgstr "Soubor již existuje. Chcete ho nahradit?"
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Pozdržená pošta"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Nevyžádaná"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" nemůže být obsaženo v názvu složky."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka \"%s\" již existuje."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nelze vytvořit složku \"%s\"."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Vy_tvořit novou složku..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Přej_menovat složku..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/Přes_unout složku..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Smazat složku"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/V_yprázdnit koš"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/V_yprázdnit koš"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Aktualizovat sou_hrn"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Označit vše jako př_ečtené"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/Odeslat pozdržené z_právy"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Na_jít zprávy..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Uprav_it možnosti hledání..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Stáhn_out"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Ode_bírat diskusní skupinu..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Odstranit d_iskusní skupinu"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Vytváří se strom složek...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nové"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Celkem"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Nastavování informace o složce...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Nastavování informace o složce..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledává se složka %s%c%s..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledává se složka %s..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom složek bude obnoven. Pokračovat?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Obnovuje se strom složek..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu složek se nezdařila."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťují se nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Nevyžádaná"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Stahují se zprávy v %s..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Stáhnout všechny zprávy v \"%s\"?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Stáhnout všechny zprávy"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Při stahování zpráv v \"%s\" se vyskytla chyba."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2473,26 +2479,26 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít\n"
 "podsložky, přidejte na konec názvu \"/\".)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte prosím nový název pro \"%s\":"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nelze přejmenovat složku \"%s\"."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nelze přesunout složku \"%s\"."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2501,11 +2507,11 @@ msgstr ""
 "Opravdu smazat složku hledání \"%s\"?\n"
 "Skutečné zprávy nebudou vymazány."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Smazat složku hledání"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2518,20 +2524,30 @@ msgstr ""
 "\n"
 "Chcete je opravdu smazat?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nelze odstranit složku \"%s\"."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Smazat všechny zprávy v koši?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Vyžádaná"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Smazat všechny zprávy v koši?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2540,34 +2556,34 @@ msgstr ""
 "Opravdu odstranit poštovní schránku \"%s\"?\n"
 "(Zprávy NEBUDOU smazány z disku.)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat účet IMAP4 \"%s\"?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Smazat účet IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu smazat diskusní skupinu \"%s\"?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet diskusních skupin \"%s\"?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Smazat účet diskusních skupin"
 
@@ -2580,7 +2596,7 @@ msgid "Creating header view...\n"
 msgstr "Vytváří se náhled záhlaví...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
@@ -2649,112 +2665,112 @@ msgstr "Vybrat složku k importu"
 msgid "Select importing file"
 msgstr "Vybrat soubor k importu"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Zadejte prosím název adresáře a soubor k importu."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Vyberte a přeskupte prosím názvy polí CSV k importu."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Soubor importován."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Vyberte prosím soubor."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Je nutné zadat název adresáře."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Chyba při čtení polí CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Import souboru CSV byl úspěšný."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Vybrat soubor CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Název souboru"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Oddělený čárkou"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Oddělený tabulátorem"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Pole CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Pole adresáře"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Pole adresáře lze přeskupit pomocí tlačítek \"Nahoru\" a \"Dolů\"."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Nahoru"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Dolů"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adresář:"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Název souboru:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Záznamů:"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importovat soubor CSV do adresáře"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Následující"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Předchozí"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Informace o souboru"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Pole"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Dokončit"
 
@@ -2932,7 +2948,7 @@ msgstr "Ukončování"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Přijímá se zpráva (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3027,16 +3043,16 @@ msgstr "Zadejte heslo"
 msgid "Protocol log"
 msgstr "Záznamový protokol"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použití: %s [VOLBY]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]            otevře okno psaní nové zprávy"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3046,23 +3062,23 @@ msgstr ""
 "                                otevře okno psaní zprávy se zadanými\n"
 "                                soubory jako přílohou"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive                     přijme nové zprávy"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all                 přijme nové zprávy ze všech účtů"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                        odešle všechny pozdržené zprávy"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [složka]...          vypíše celkový počet zpráv"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3070,47 +3086,47 @@ msgstr ""
 "  --status-full [složka]...\n"
 "                                vypíše stav každé ze složek"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open IDsložky/číslozprávy   otevře zprávu v novém okně"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir adresář           určí adresář se soubory uživatelského "
 "nastavení"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport čísloportu             určí port pro vzdálené příkazy IPC"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                        ukončí Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                       režim ladění"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                        vypíše tuto nápovědu a skončí"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version                     vypíše informaci o verzi a skončí"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Stiskněte libovolnou klávesu..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Kódování názvu souboru"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3134,19 +3150,19 @@ msgstr ""
 "\n"
 "Pokračovat?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Je rozepsána zpráva. Opravdu skončit?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Pozdržené zprávy"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Některé neodeslané zprávy jsou pozdržené. Skončit nyní?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3154,20 +3170,20 @@ msgstr ""
 "GnuPG není korektně instalováno nebo je příliš staré verze.\n"
 "Podpora OpenPGP je zakázána."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Nahrávají se zásuvné moduly..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "aplikace Sylpheed je již spuštěna.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Přenesení uživatelského nastavení"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3511,15 +3527,15 @@ msgstr "/Z_obrazit/_Znaková sada/Čínština (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejština (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/Z_obrazit/Zd_roj zprávy"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/Z_obrazit/Všechna zá_hlaví"
 
@@ -3818,8 +3834,8 @@ msgstr "Vytváří se hlavní okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3888,7 +3904,7 @@ msgstr "Sylpheed - Strom složek"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
@@ -3904,15 +3920,15 @@ msgstr "/Odpovědět _odesílateli"
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _elektronické konferenci"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Předat dál _jako přílohu"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
@@ -3956,19 +3972,19 @@ msgstr "Opravdu ukončit Sylpheed?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Vyberte složku, kterou chcete otevřít"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Přepínače příkazové řádky"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použití: sylpheed [VOLBY]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3998,7 +4014,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4028,15 +4044,15 @@ msgstr ""
 "vypíše tuto nápovědu a skončí\n"
 "vypíše informaci o verzi a skončí"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport čísloportu             určí port pro vzdálené příkazy IPC"
@@ -4094,7 +4110,7 @@ msgstr "Přílohy"
 msgid "Message View - Sylpheed"
 msgstr "Zobrazení zprávy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nelze uložit soubor \"%s\"."
@@ -4115,7 +4131,7 @@ msgstr "/_Uložit jako..."
 msgid "/Save _all..."
 msgstr "/U_ložit vše..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Tisk..."
 
@@ -4505,7 +4521,7 @@ msgstr "Přímý vstup"
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavovat následující adresy"
 
@@ -4757,7 +4773,7 @@ msgstr " Nápověda k syntaxi "
 msgid "Registered actions"
 msgstr "Přidané akce"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nový)"
 
@@ -6110,28 +6126,28 @@ msgstr "Typ"
 msgid "Normal"
 msgstr "Běžný"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nezobrazovat v souhrnu na začátku předmětu [...] nebo (...)"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "U odpovědi smazat ze začátku předmětu [...] nebo (...)"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Účet"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Zahrnout podsložky"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "používat také u odpovědi"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Odpovědi zaslat na:"
 
@@ -6167,19 +6183,19 @@ msgstr "Příloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Odesílatel"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Datum"
 
@@ -6189,7 +6205,7 @@ msgid "Number"
 msgstr "Číslo"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Příjemce"
 
@@ -6209,43 +6225,61 @@ msgstr ""
 "Vyberte prosím položky, které chcete zobrazovat v souhrnu zpráv.\n"
 "Pořadí lze změnit pomocí tlačítek \"Nahoru\" a \"Dolů\"."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Název šablony"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Přidat"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Nahradit "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Symboly "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Přidané šablony"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Šablony"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Název šablony"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Název šablony"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Šablona"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Chyba formátu v šabloně."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Smazat šablonu"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Opravdu chcete smazat tuto šablonu?"
 
@@ -6479,7 +6513,7 @@ msgstr "Prohledává se %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Prohledává se %s..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Bez data)"
 
@@ -6576,7 +6610,7 @@ msgstr "O _aplikaci"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Vzdálená poštovní schránka POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Č."
 
@@ -7135,7 +7169,7 @@ msgstr "Přijímá se seznam diskusních skupin..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nelze přijmout seznam diskusních skupin."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Hotovo."
 
@@ -7144,344 +7178,344 @@ msgstr "Hotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "přijatých diskusních skupin %d (přečtených %s)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Odpovědět _komu"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Odpovědět _komu/_Všem"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Odpovědět _komu/_Odesílateli"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odpovědět _komu/_Elektronické konferenci"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Přesunout..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/Kopí_rovat..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Označ_it"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Označit/_Označit"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Označit/_Zrušit označení"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Označit/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Označit/Označit jako _nepřečtené"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označit/Označit jako př_ečtené"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Označit/Označit _vlákno jako přečtené"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označit/Označit všechny jako _přečtené"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/_Barevný štítek"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Označit jako _nevyžádanou poštu"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Označit jako v_yžádanou poštu"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Z_novu upravit"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Přid_at odesílatele do adresáře..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/_Vytvořit filtr"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Vytvořit filtr/_Automaticky"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Vytvořit filtr/Podle _odesílatele"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Vytvořit filtr/Podle pří_jemce"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Vytvořit filtr/Podle _předmětu"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Vytváří se souhrn zpráv...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Prohledává se složka (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Zpracovat označené"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Zbyly nějaké označené. Zpracovat je?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prohledává se složka (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Nelze navázat spojení IMAP.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Hledat znovu"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Žádné další nepřečtené zprávy"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Přejít do další složky?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Žádné další nové zprávy"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nebyla nalezena žádná nová zpráva. Přejít do další složky?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Žádné další označené zprávy"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná označená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Žádné označené zprávy."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná označená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Žádné další zprávy se štítkem"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná zpráva se štítkem. Hledat od konce?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Žádné zprávy se štítkem."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenalezena žádná zpráva se štítkem. Hledat od začátku?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Získávají se zprávy s předmětem..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "smazaných %d"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "přemístěných %s%d"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "zkopírovaných %s%d"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " vybraných položek"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nových %d, nepřečtených %d, celkem %d (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nových %d, nepřečtených %d, celkem %d"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Třídění souhrnu..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavování souhrnu z dat zpráv..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Nastavování souhrnu z dat zpráv..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisování vyrovnávací paměti souhrnu (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Zpráva %d je označena jako přečtená\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Zpráva %d je označena jako nepřečtená\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Zpráva %s/%d je připravena na smazání\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Smazat zprávy"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Opravdu chcete vymazat zprávy z koše?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávání duplikovaných zpráv..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d má zrušeno označení\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Zpráva %d je připravena na přesun do %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Vyberte složku, kterou chcete přesunout"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Zpráva %d je připravena na zkopírování do %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 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:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Vyberte složku, kterou chcete kopírovat"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Vytváří se vlákna..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Ruší se vlákna..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrování (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrování..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrování..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "filtrovaných zpráv %d."
diff --git a/po/da.po b/po/da.po
index d57d12fc..a6d71d55 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -323,7 +323,7 @@ msgstr ""
 "Filen `%s' eksisterer allerede.\n"
 "Kan ikke oprette mappe."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -505,12 +505,12 @@ msgstr "Fundet %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration er gemt.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Mappe"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mappe"
@@ -654,7 +654,7 @@ msgstr ""
 "program.Hvis ikke, så skriv til Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -692,7 +692,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -835,8 +835,8 @@ msgstr "Tilføj adresse i adressebog"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -844,34 +844,34 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Vælg adressebog mappe"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrerede regler"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Filer"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Filer/Ny _adressebog"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Filer/Ny _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Filer/Ny _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Filer/Ny _server"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -879,196 +879,196 @@ msgstr "/_Filer/Ny _server"
 msgid "/_File/---"
 msgstr "/_Filer/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Filer/_Redigér"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Filer/_Slet"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Filer/_Gem"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Filer/_Luk"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigér/K_opiere"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Ny _adresse"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Ny _gruppe"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Ny _mappe"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Redigér"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Slet"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Funktioner"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Funktioner/Importer _LDIF-Fil"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjælp"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjælp/_Om"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Ny _adresse"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Ny _gruppe"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Slet"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopier..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigér/_Sæt ind"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressebog"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappe"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Søg"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Slet"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Tilføj"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Søg"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Luk"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Slet adresse(r)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Virklig slette adresse(r)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1077,38 +1077,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Slet mappe"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ny mappe"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mappe og adresser"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Virklig slette `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Ny bruger, kunne ikke gemme index fil."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Ny bruger, kunne ikke gemme adressebogs fil."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Gammel adressebog konverteret."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Gammel adressebog konverteret,\n"
 "men kunne ikke gemme index filen"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "men nye og tomme filer blev oprettet."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1140,17 @@ msgstr ""
 "Kunne ikke konvertere adressebog,\n"
 "kunne ikke oprette nye filer."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,75 +1158,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressebog fejl"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Kunne ikke læse adressebog"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adressebog konverterings fejl"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressebog konvertering"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Brugerflade"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressebog"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "E-post adresse"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1238,11 +1238,11 @@ msgstr "Normale adresser"
 msgid "Personal address"
 msgstr "Personlige adresser"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Note"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Advarsel"
 
@@ -1289,7 +1289,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ingen"
 
@@ -1305,8 +1305,8 @@ msgstr "/_Tilføj..."
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
@@ -1386,7 +1386,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Vis"
 
@@ -1670,7 +1670,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
@@ -1714,7 +1714,7 @@ msgstr "Udfyld automatisk følgende adresser"
 msgid "From:"
 msgstr "Fra:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Emne:"
 
@@ -1862,7 +1862,7 @@ msgstr "MIME type"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Størrelse"
 
@@ -1994,28 +1994,28 @@ msgstr "Et navn og en værdi skal indtastes."
 msgid "Edit Person Data"
 msgstr "Redigér person data"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Vis navn"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Efternavn"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Fornavn"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Alias"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-post adresse"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2129,12 +2129,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2151,7 +2151,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigér JPilot indtastning"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2344,201 +2344,207 @@ msgstr ""
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/_Opret ny mappe..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Omdøb mappe..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Omdøb mappe..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Slet mappe"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Tøm Slettet"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/_Markér/_Læst"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Søg meddelelse..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ingen ulæste meddelelser."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Abonner på nyhedsgruppe..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Slet nyhedsgruppe"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Opretter mappe træ...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Ulæst"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe træ"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2548,26 +2554,26 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2576,12 +2582,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2592,21 +2598,31 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Emne"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Slet alle meddelelser i Slettet?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2615,34 +2631,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2655,7 +2671,7 @@ msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -2735,120 +2751,120 @@ msgstr "Vælg fil til import"
 msgid "Select importing file"
 msgstr "Vælg fil til import"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Indtast adressebog navn og fil til import"
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Vælg og omdøb LDIF felt navne til import"
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fil importeret."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Vælg fil."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Adressebogs navn skal angives."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Fej ved læsning af LDIF fil."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF fil blev importeret."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "VCard-Datei wählen"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Fil navn"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "Vælg LDIF felt"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adressebog :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Op"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Ned"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adressebog :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Fil navn :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Poster :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Importer LDIF fil til adressebog"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Næste"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Forrige"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Fil info"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "Vælg LDIF felt"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Slut"
 
@@ -3028,7 +3044,7 @@ msgstr "Afslutter"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Modtager meddelelse (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3127,16 +3143,16 @@ msgstr "Indtast adgangskode"
 msgid "Protocol log"
 msgstr "Protokol log"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    åbner nyt meddelelses vindue"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3146,23 +3162,23 @@ msgstr ""
 "                         åbn ny meddelelse med disse filer vedhæftet\n"
 "                         ."
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              modtager nye meddelelser"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          modtager nye meddelelser fra alle konti"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 send alle meddelelser i kø"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappe]...   viser antal meddelelser"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3170,49 +3186,49 @@ msgstr ""
 "  --status-full [mappe]...\n"
 "                         viser status for hver mappe"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug mode"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 viser denne hjælp"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              viser version og afslutter"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "eller tast `y'.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Udgående tegnsæt"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3226,19 +3242,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Du er ved at skrive ny meddelelse. Virklig afslutte?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Meddeleser i kø"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nogle usendte meddelelser i kø. Afslut nu?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3246,21 +3262,21 @@ msgstr ""
 "GnuPG er ike korrekt installeret eller i for gammel version\n"
 "OpenPGP ikke mulig."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "sylpheed kører allerede.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Handlingsopsæt"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3629,15 +3645,15 @@ msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Vis/_Kilde"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Vis/Alle _hoveder"
@@ -3955,8 +3971,8 @@ msgstr "Opretter hoved vindue...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -4027,7 +4043,7 @@ msgstr "Sylpheed - Mappe visning"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Svar"
 
@@ -4046,15 +4062,15 @@ msgstr "/_Svar til/_Afsender"
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
@@ -4101,22 +4117,22 @@ msgstr "Afslut program?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Vælg mappe"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommando linie ikke opsat."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Bruges som: %s [OPTION]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4133,7 +4149,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4150,15 +4166,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4215,7 +4231,7 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
@@ -4237,7 +4253,7 @@ msgstr "/_Gem som..."
 msgid "/Save _all..."
 msgstr "/_Gem som..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Udskriv..."
 
@@ -4647,7 +4663,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Kommando tekst"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Udfyld automatisk følgende adresser"
 
@@ -4904,7 +4920,7 @@ msgstr " Syntaks hjælp"
 msgid "Registered actions"
 msgstr "Registrerede handlinger"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nye)"
 
@@ -6334,28 +6350,28 @@ msgstr "Type"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Vis ikke [...] eller (...) i starten af Emne linien i oversigten"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Slet [...] og (...) i starten af Emne i besvarelser"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Konto"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Benyt til undermapper"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "benyt også ved svar"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Svar til:"
 
@@ -6394,19 +6410,19 @@ msgstr "Vedhæftet"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Dato"
 
@@ -6416,7 +6432,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Til:"
@@ -6438,43 +6454,61 @@ msgstr ""
 "Vælg de oplysninger, der skal vises i oversigts vindue. Du kan ændre\n"
 "rækkefølgen ved at benytte Op / Ned knapperne eller ved at trække med musen."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Skabelon navn"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registrere"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Erstat "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Symbol "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registrerede skabloner"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Skabeloner"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Skabelon navn"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Skabelon navn"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Skabelon"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Skabelon format fejl."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Slet Skabelon"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Vil du virkelig slette denne Skabelon?"
 
@@ -6723,7 +6757,7 @@ msgstr "Filtrering..."
 msgid "Searching %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
@@ -6832,7 +6866,7 @@ msgstr "Om"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Slet mappe"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Nr."
 
@@ -7403,7 +7437,7 @@ msgstr "Kan ikke modtage gruppe liste."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke modtage gruppe liste."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Afsluttet."
 
@@ -7412,355 +7446,355 @@ msgstr "Afsluttet."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Nyhedsgruppe(r) modtaget (%s læst)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/_Svar til"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/_Svar til/_Alle"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Flyt..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopier..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Markér"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Markér/_Markér"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Markér/_Slet markéring"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Markér/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markér/_Ulæst"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markér/_Læst"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Markér/_Læst"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markér/_Alle læst"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Farve la_bel"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Standard konto"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Standard konto"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Redigér _igen"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/_Opret filter"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Opret filter/_Automatisk"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Opret filter/Efter _Fra"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Opret filter/Efter _Til"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Opret filter/Efter _Emne"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Opretter oversigt...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Søger mappe (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Bearbejder markéring"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Nogle markéringer er tilbage. Bearbejde dem?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Søger mappe (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Søg igen"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ulæste meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Ingen ulæste meddelelser."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Ingen ulæste meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Ingen nye meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen markérede meddelelser fundet. Søg bagfra?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Ingen markérede eddelelser."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen markérede meddelelser funder. Søg bagfra?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Ingen markérede meddelelser."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ulæst, %d total (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ulæste, %d total"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Vælg mappe"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Vælg mappe"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
diff --git a/po/de.po b/po/de.po
index 5a0d481b..01134aef 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2007-09-29 23:16+0100\n"
 "Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: de\n"
@@ -321,7 +321,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -505,11 +505,11 @@ msgstr "Gefunden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguration wurde gespeichert.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Manueller Spam-Mail Filter"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Spam-Mail Filter"
 
@@ -654,7 +654,7 @@ msgstr ""
 "erhalten haben; wenn nicht, dann schreiben Sie an Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -693,7 +693,7 @@ msgstr ""
 "Schalter\n"
 "in der 'G'-Spalte, um den Nachrichten-Empfang bei 'Hole alle' einzuschalten."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -834,8 +834,8 @@ msgstr "Adresse in Adressbuch einfügen"
 msgid "Address"
 msgstr "Adresse"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentar"
 
@@ -843,33 +843,33 @@ msgstr "Kommentar"
 msgid "Select Address Book Folder"
 msgstr "Wähle Adressbuchablage"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrierte Schablonen"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datei"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Datei/Neues Adress_buch"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Datei/Neue _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Datei/Neues _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datei/Neuer _LDAP-Server"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -877,190 +877,190 @@ msgstr "/_Datei/Neuer _LDAP-Server"
 msgid "/_File/---"
 msgstr "/_Datei/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Datei/_Bearbeiten"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Datei/_Löschen"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Datei/_Speichern"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datei/S_chließen"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Bearbeiten/_Kopieren"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Bearbeiten/_Einfügen"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Neue _Adresse"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Neue _Gruppe"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Neue Ab_lage"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/_Bearbeiten"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Löschen"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Werkzeug"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Werkzeug/Importiere _LDIF-Datei"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Werkzeug/Importiere _CSV-Datei"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hilfe/_Über"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Neue _Adresse"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Neue _Gruppe"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Löschen"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Kopieren"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/_Einfügen"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbuch"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Ablage"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Suchen:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Löschen"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Suchen"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Schließen"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Adresse(n) löschen"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Adresse(n) wirklich löschen?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,36 +1070,36 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Nur Abla_ge"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Ablage und _Adressen"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wirklich '%s' löschen ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Neuer Benutzer, kann Index-Datei nicht speichern."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Neuer Benutzer, kann Adressbuch-Dateien nicht speichern."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Altes Adressbuch erfolgreich konvertiert."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1107,7 @@ msgstr ""
 "Altes Adressbuch konvertiert,\n"
 "kann neue Adress-Index-Datei nicht speichern"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "aber erstellte neue leere Adressbuch-Dateien."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1123,7 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren,\n"
 "konnte neue Adressbuch-Dateien nicht erstellen."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1131,15 @@ msgstr ""
 "Konnte Adressbuch nicht konvertieren\n"
 "und konnte neue Adressbuch-Dateien erstellen."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,78 +1147,78 @@ msgid ""
 "%s%c%s"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Adressbuch-Fehler"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Konnte Adress-Index nicht lesen"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Adressbuch-Konvertierungsfehler"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Adressbuch-Konvertierung"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Benutzerschnittstelle"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbuch"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "E-Mail Adresse"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Gruppe"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP-Server"
 
@@ -1230,11 +1230,11 @@ msgstr "Allgemeine Adressen"
 msgid "Personal address"
 msgstr "Persönliche Adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Notiz"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Warnung"
 
@@ -1281,7 +1281,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Keine"
 
@@ -1297,8 +1297,8 @@ msgstr "/_Hinzufügen..."
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
@@ -1372,7 +1372,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Ansicht"
 
@@ -1621,7 +1621,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -1664,7 +1664,7 @@ msgstr "Setze folgende Adressen automatisch"
 msgid "From:"
 msgstr "Von:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Betreff:"
 
@@ -1818,7 +1818,7 @@ msgstr "MIME-Typ"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Größe"
 
@@ -1948,28 +1948,28 @@ msgstr "Ein Name und ein Wert müssen angegeben werden."
 msgid "Edit Person Data"
 msgstr "Personen-Daten bearbeiten"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Namen anzeigen"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Nachname"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Vorname"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Spitzname"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Mail Adresse"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2081,12 +2081,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2103,7 +2103,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot-Eintrag bearbeiten"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2295,194 +2295,200 @@ msgstr "Die Datei existiert bereits. Wollen Sie sie ersetzen?"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Spam"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/Ablage _verschieben..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Ablage _löschen"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Leere _Papierkorb"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Leere _Papierkorb"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten prüfen"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/A_blagebaum erneuern"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/_Update Zusammenfassung"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/_Alle als gelesen markieren"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "_Senden wartender Nachrichten"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Suche Nachrichten..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Suchbedingungen _bearbeiten..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Herunterladen"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Newsgroup _abonnieren..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Erstelle Ablageansicht...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Gesamt"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Spam"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Alle Nachrichten herunter laden unter '%s' ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Alle Nachrichten herunter laden"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2492,26 +2498,26 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann hängen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kann Ablage '%s' nicht umbenennen."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2520,11 +2526,11 @@ msgstr ""
 "Suchablage '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Suchablage löschen"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2537,20 +2543,30 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Kein Spam"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Lösche alle Nachrichten im Papierkorb?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2559,34 +2575,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -2599,7 +2615,7 @@ msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -2679,113 +2695,113 @@ msgstr "Wähle importierte Datei"
 msgid "Select importing file"
 msgstr "Wähle importierte Datei"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr ""
 "Bitte, geben Sie ein Adressbuchnamen und eine Datei zum Importieren an."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Wähle und sortiere CSV-Feldnamen zum Import."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Datei importiert."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Bitte eine Datei wählen."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Ein Adressbuchname muss angegeben werden."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Fehler beim Lesen der CSV-Felder."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "CSV-Datei erfolgreich importiert."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "CSV-Datei auswählen"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Dateiname"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Komma-seperiert"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Tab-seperiert"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "CSV-Feld"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Adressbuch-Feld"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Organisieren Sie die Adressbuchfelder mit den Auf-/Ab-Knöpfen neu"
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Auf"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Ab"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adressbuch :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Dateiname :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Felder :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importiere CSV-Datei in Adressbuch"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Nächste"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Vorherige"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Datei-Info"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Felder"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Ende"
 
@@ -2964,7 +2980,7 @@ msgstr "Beenden"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Empfange Nachricht (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3059,16 +3075,16 @@ msgstr "Kennwort eingeben"
 msgid "Protocol log"
 msgstr "Mitschrift des Protokolls"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Aufruf: %s [OPTION]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [Adresse]    öffnet Verfassenfenster"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3078,23 +3094,23 @@ msgstr ""
 "                         öffne Verfassen-Fenster mit angegebenen Dateien\n"
 "                         angehängt"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              empfängt neue Nachrichten"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          empfängt neue Nachrichten von allen Accounts"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 sendet alle Nachrichten aus der Warteschlange"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [Ablage]...   zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3102,47 +3118,47 @@ msgstr ""
 "  --status-full [Ablage]...\n"
 "                         zeigt die Gesamtzahl aller Nachrichten"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open OrdnerID/msgnum öffnet Nachrichten in neuem Fenster"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "··--configdir·dirname····gib das Verzeichnis an, in dem die "
 "Konfigurationsdateien gespeichert werden"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      definiert Port für \"IPC remote\" Befehle"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                Beende Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                Fehlersuche"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 diese Hilfe"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              gibt Version aus und beendet"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Drücken Sie eine Taste"
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Dateiname Zeichensatz"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3166,19 +3182,19 @@ msgstr ""
 "\n"
 "Weiter?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Verfasste Nachricht existiert. Wirklich beenden?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Wartende Nachrichten"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Einige ungesendete Nachrichten vorhanden. Jetzt beenden?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3186,20 +3202,20 @@ msgstr ""
 "GnuPG is nicht richtig installiert, oder die Version ist zu alt.\n"
 "OpenPGP-Unterstützung ausgeschaltet"
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "Ein anderes Sylpheed läuft schon.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Konfigurationsmigration"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3547,15 +3563,15 @@ msgstr "/_Ansicht/_Zeichensatz/Chinesisch (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Ansicht/Nachrichten_quelle"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Ansicht/_Alle Kopfzeilen anzeigen"
 
@@ -3856,8 +3872,8 @@ msgstr "Erstelle Hauptfenster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -3925,7 +3941,7 @@ msgstr "Sylpheed - Ablagenansicht"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/An_twort"
 
@@ -3941,15 +3957,15 @@ msgstr "/Ant_wort an Ab_sender"
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
@@ -3993,20 +4009,20 @@ msgstr "Beenden des Programms?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Wähle Ablage"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Kommandozeilenoptionen"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Aufruf: sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4036,7 +4052,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4065,15 +4081,15 @@ msgstr ""
 "diese Hilfe anzeigen und beenden\n"
 "Versionsinformationen anzeigen und beenden"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      definiert Port für \"IPC remote\" Befehle"
@@ -4131,7 +4147,7 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
@@ -4152,7 +4168,7 @@ msgstr "/Speichern _als..."
 msgid "/Save _all..."
 msgstr "/Alle speichern..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Drucken..."
 
@@ -4548,7 +4564,7 @@ msgstr "Direkteingabe"
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Setze folgende Adressen automatisch"
 
@@ -4798,7 +4814,7 @@ msgstr "  Syntax Hilfe "
 msgid "Registered actions"
 msgstr "Registrierte Aktionen"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Neue)"
 
@@ -6172,30 +6188,30 @@ msgstr "Typ"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 "[...] oder (...) am Anfang des Betreffes der Ablageninhaltsansicht nicht "
 "zeigen"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "[...] oder (...) am Anfang des Betreffes der Antwort löschen"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Account"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Auf Unterablagen anwenden"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "auch bei Antwort benutzen"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
@@ -6231,19 +6247,19 @@ msgstr "Anhang"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Datum"
 
@@ -6253,7 +6269,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "An"
 
@@ -6274,43 +6290,61 @@ msgstr ""
 "werden.\n"
 " Sie können die Reihenfolge der Einträge mit den Auf-/Ab-Knöpfen verändern."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Schablonenname"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registrieren"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Ersetzen "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Symbole "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registrierte Schablonen"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Schablonen"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Schablonenname"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Schablonenname"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Schablone"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Schablonen-Format-Fehler."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Schablone löschen"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Wollen Sie diese Schablone wirklich löschen?"
 
@@ -6547,7 +6581,7 @@ msgstr "Suche %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Suche %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
@@ -6649,7 +6683,7 @@ msgstr "_Über"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Nr."
 
@@ -7237,7 +7271,7 @@ msgstr "Hole Newsgroup-Liste..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Newsgroup-Liste nicht empfangen."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Fertig."
 
@@ -7246,346 +7280,346 @@ msgstr "Fertig."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d Newsgruppe(n) empfangen (%s gelesen)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Ant_wort an"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Ant_wort an/_Alle"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Ant_wort an/Ab_sender"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Antwort an/Mailing-_Liste"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Verschieben..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopieren..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Markieren"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Markieren/_Markieren"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Markieren/Markierung _entfernen"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Markieren/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markieren/Als _ungelesen markieren"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markieren/Als _gelesen markieren"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Markieren/_Thread als gelesen markieren"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markieren/_Alle als gelesen markieren"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Far_betikett"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "Markiere als Spam-Mail"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "Markiere als Nicht-Spam-Mail"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Wi_ederbearbeiten"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Absender in Adress_buch einfügen"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Filter _erstellen"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Filter _erstellen/_Automatisch"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Filter _erstellen/nach _Von"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Filter _erstellen/nach A_n"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Filter _erstellen/nach _Betreff"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Erstelle Ablageninhaltsansicht...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "Weiter_suchen"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " Einträge gewählt"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Wähle Ablage"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Wähle Ablage"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
diff --git a/po/el.po b/po/el.po
index b0cdcd3b..380a8157 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.4.0beta5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2007-03-17 00:57+0200\n"
 "Last-Translator: Stavros Giannouris <stavrosg@hellug.gr>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -325,7 +325,7 @@ msgstr ""
 "Το αρχείο '%s' υπάρχει ήδη.\n"
 "Δεν είναι δυνατή η δημιουργία του φακέλου."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -511,11 +511,11 @@ msgstr "Βρέθηκαν %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Οι ρυθμίσεις αποθηκεύτηκαν.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας (χειροκίνητο)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Φίλτρο ανεπιθύμητης αλληλογραφίας"
 
@@ -665,7 +665,7 @@ msgstr ""
 "(Free Software Foundation) στη διεύθυνση Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02110-1301, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -705,7 +705,7 @@ msgstr ""
 "στη στήλη 'G' για να ενεργοποιήσετε τη λήψη μηνυμάτων με την εντολή 'Λήψη "
 "όλων'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -847,8 +847,8 @@ msgstr "Προσθήκη διεύθυνσης στο ευρετήριο"
 msgid "Address"
 msgstr "Διεύθυνση"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Σχόλια"
 
@@ -856,33 +856,33 @@ msgstr "Σχόλια"
 msgid "Select Address Book Folder"
 msgstr "Επιλογή φακέλου από το Ευρετήριο διευθύνσεων"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Αποθηκευμένα πρότυπα"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Αρχείο"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Αρχείο/Νέο ε_υρετήριο διευθύνσεων"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Αρχείο/Νέα _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Αρχείο/Νέο _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -890,191 +890,191 @@ msgstr "/_Αρχείο/Προσθήκη νέου διακομιστή _LDAP"
 msgid "/_File/---"
 msgstr "/_Αρχείο/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Αρχείο/_Επεξεργασία"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Αρχείο/_Διαγραφή"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Αρχείο/_Αποθήκευση"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Αρχείο/_Κλείσιμο"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Επεξεργασία"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Επεξεργασία/_Αντιγραφή"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Επεξεργασία/Ε_πικόλληση"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Διεύθυνση"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Διεύθυνση/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Διεύθυνση/Νέα ο_μάδα"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Διεύθυνση/Νέος _φάκελος"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Διεύθυνση/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Διεύθυνση/_Επεξεργασία"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Διεύθυνση/_Διαγραφή"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Εργαλεία"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Εργαλεία/Εισαγωγή αρχείου _LDIF"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Βοήθεια"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Βοήθεια/_Σχετικά"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Νέα δ_ιεύθυνση"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Νέα _ομάδα"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Νέος _φάκελος"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Διαγραφή"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Αντιγραφή"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/Ε_πικόλληση"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Φάκελος"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Αναζήτηση:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Κρυφή κοινοποίηση:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Κλείσιμο"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Διαγραφή διεύθυνσης (διευθύνσεων)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τις διευθύνσεις;"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1083,37 +1083,37 @@ msgstr ""
 "Θέλετε να διαγράψετε το '%s' ; Αν διαγράψετε μόνο το φάκελο, οι διευθύνσεις "
 "που περιέχει θα μετακινηθούν στον γονικό φάκελο."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Διαγραφή φακέλου"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "_Φάκελος μόνο"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Φάκελος και _διευθύνσεις"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Σίγουρα να διαγραφεί το '%s' ;"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr ""
 "Νέος χρήστης, δεν είναι δυνατή η αποθήκευση του ευρετηρίου διευθύνσεων."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Το παλιό ευρετήριο διευθύνσεων μετατράπηκε με επιτυχία."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 #, fuzzy
 msgid ""
 "Old address book converted,\n"
@@ -1122,7 +1122,7 @@ msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1130,7 +1130,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 #, fuzzy
 msgid ""
 "Could not convert address book,\n"
@@ -1139,7 +1139,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1147,17 +1147,17 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του ευρετηρίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Μετατροπή ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1165,19 +1165,19 @@ msgid ""
 "%s%c%s"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Σφάλμα ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 #, fuzzy
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Το παλιό βιβλίο διευθύνσεων μετατράπηκε επιτυχώς,\n"
 "δεν είναι δυνατή η αποθήκευση του νέου ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 #, fuzzy
 msgid ""
 "Could not convert address book, but created empty new address book files."
@@ -1185,7 +1185,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων.\n"
 "Δημιουργήθηκε νέο, κενό αρχείο."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 #, fuzzy
 msgid ""
 "Could not convert address book, could not create new address book files."
@@ -1193,7 +1193,7 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 #, fuzzy
 msgid ""
 "Could not convert address book and could not create new address book files."
@@ -1201,51 +1201,51 @@ msgstr ""
 "Δεν είναι δυνατή η μετατροπή του βιβλίου διευθύνσεων,\n"
 "ούτε η δημιουργία νέου."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Δεν είναι δυνατή η ανάγνωση του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Σφάλμα κατά τη μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Μετατροπή του ευρετηρίου διευθύνσεων"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Διεπαφή"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Ευρετήριο διευθύνσεων"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Άτομο"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Ομάδα"
 
 # Untrans.
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
 # Untans.
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Διακομιστής LDAP"
 
@@ -1257,11 +1257,11 @@ msgstr "Κοινές διευθύνσεις"
 msgid "Personal address"
 msgstr "Προσωπικές διευθύνσεις"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Σημείωση"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Προειδοποίηση"
 
@@ -1309,7 +1309,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Κανένα"
 
@@ -1325,8 +1325,8 @@ msgstr "/_Προσθήκη..."
 msgid "/_Remove"
 msgstr "/_Διαγραφή"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Ιδιότητες..."
 
@@ -1400,7 +1400,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αυτό_ματη αναδίπλωση"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Προβολή"
 
@@ -1651,7 +1651,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Δεν είναι δυνατή η λήψη μέρους του πολυτμηματικού μηνύματος."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Χωρίς θέμα)"
 
@@ -1694,7 +1694,7 @@ msgstr "Αυτόματος ορισμός αυτών των διευθύνσεω
 msgid "From:"
 msgstr "Από:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Θέμα:"
 
@@ -1852,7 +1852,7 @@ msgstr "τύπος MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -1982,28 +1982,28 @@ msgstr "Πρέπει να προσδιοριστεί όνομα και τιμή.
 msgid "Edit Person Data"
 msgstr "Επεξεργασία δεδομένων"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Εμφανιζόμενο όνομα"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Επώνυμο"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Όνομα"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Ψευδώνυμο"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Διεύθυνση ηλεκτρονικής αλληλογραφίας"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Ψευδώνυμο"
 
@@ -2117,12 +2117,12 @@ msgstr "Επεξεργασία φακέλου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του φακέλου:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Νέος φάκελος"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου φακέλου:"
 
@@ -2139,7 +2139,7 @@ msgid "Edit JPilot Entry"
 msgstr "Επεξεργασία εγγραφής JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2334,197 +2334,203 @@ msgstr ""
 msgid "Select folder"
 msgstr "Επιλογή φακέλου"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Σταλμένα"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Ανεπιθύμητη αλληλογραφία"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "ΝέοςΦάκελος"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα φακέλου."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο φάκελος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Δεν είναι δυνατή η δημιουργία του φακέλου `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Δημιουργία _νέου φακέλου..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Μετονομασία φακέλου..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Μετακίνηση φακέλου..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Διαγραφή φακέλου"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Ά_δειασμα Απορριμμάτων"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Ά_δειασμα Απορριμμάτων"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Έλε_γχος για νέα μηνύματα"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Ανακατασκευή _διάταξης φακέλων"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Ε_νημέρωση περίληψης"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Σήμανση ό_λων ως αναγνωσμένα"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Α_ποστολή μηνυμάτων στην ουρά"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Ανα_ζήτηση στα μηνύματα..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Επεξεργασία κρ_ιτηρίων αναζήτησης..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/_Λήψη"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Συνδρομή σε ομάδα συζητήσεων / νέων..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 #, fuzzy
 msgid "/_Remove newsgroup"
 msgstr "Συνδρομές νέων:"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Δημιουργία προβολής φακέλων...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Νέα"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Σύνολο"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Ορισμός πληροφοριών φακέλου...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες φακέλων..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση φακέλων %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση φακέλου %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Επαναδημιουργία διάταξης φακέλων"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Θα ξαναδημιουργηθεί η διάταξη των φακέλων. Συνέχεια;"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Επαναδημιουργία διάταξης φακέλων..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Η επαναδημιουργία της λίστας φακέλων απέτυχε."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Ανεπιθύμητη αλληλογραφία"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Επιλέχθηκε ο φάκελος %s\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Λήψη μηνυμάτων στο %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Λήψη μηνυμάτων στο %s ..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Λήψη μηνυμάτων στο %s ..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά τη λήψη μηνυμάτων στο '%s'."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2534,26 +2540,26 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα φάκελο για να βάλετε υποφακέλους\n"
 " προσθέστε ένα '/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Επιλέξτε ένα νέο όνομα για το `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Μετονομασία φακέλου"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Δεν είναι δυνατή η μετονομασία του φακέλου '%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν είναι δυνατή η μετακίνηση του φακέλου '%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2562,11 +2568,11 @@ msgstr ""
 "Σίγουρα να διαγραφεί ο φάκελος αναζήτησης '%s' ;\n"
 "(Τα μηνύματα δε διαγράφονται από τον δίσκο)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Διαγραφή φακέλου αναζήτησης"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2579,20 +2585,30 @@ msgstr ""
 "\n"
 "Θέλετε πράγματι να τα διαγράψετε;"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν είναι δυνατή η διαγραφή του φακέλου '%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Άδειασμα απορριμμάτων"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Διαγραφή όλων των μηνυμάτων στο φάκελο απορριμμάτων;"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Επιθυμητή αλληλογραφία"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Διαγραφή όλων των μηνυμάτων στο φάκελο απορριμμάτων;"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2601,34 +2617,34 @@ msgstr ""
 "Σίγουρα να διαγραφεί το γραμματοκιβώτιο `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Αφαίρεση γραμματοκιβωτίου"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Να διαγραφεί ο λογαριασμός IMAP4 `%s';"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Να διαγραφεί η ομάδα νέων `%s';"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Διαγραφή ομάδας νέων"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Να διαγραφεί ο λογαριασμός νέων `%s';"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού νέων"
 
@@ -2641,7 +2657,7 @@ msgid "Creating header view...\n"
 msgstr "Δημιουργία προβολής κεφαλίδων...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -2721,121 +2737,121 @@ msgstr "Επέλεξε αρχείο εισαγωγής"
 msgid "Select importing file"
 msgstr "Επέλεξε αρχείο εισαγωγής"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr ""
 "Παρακαλώ προσδιορίστε όνομα ευρετηρίου διευθύνσεων και αρχείο για εισαγωγή."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Επιλέξτε και μετονομάστε τα πεδία LDIF που θα εισάγετε."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Το αρχείο εισήχθη."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Παρακαλώ επιλέξτε ένα αρχείο."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Πρέπει να δώσετε όνομα ευρετηρίου διευθύνσεων."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Σφάλμα κατά την ανάγνωση των πεδίων LDIF."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "Το αρχείο LDIF εισήχθη επιτυχώς."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Επιλογή αρχείου vCard"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Όνομα αρχείου"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "Ε"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "Πεδίο LDIF"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Ευρετήριο διευθύνσεων :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Πάνω"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Κάτω"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Ευρετήριο διευθύνσεων :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Όνομα αρχείου :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Εγγραφές :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Εισαγωγή αρχείου LDIF στο ευρετήριο διευθύνσεων"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Επόμενο"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Προηγ"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Πληροφορίες αρχείου"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "Πεδίο LDIF"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Τέλος"
 
@@ -3015,7 +3031,7 @@ msgstr "Κλείνω τη σύνδεση"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Λαμβάνεται το μήνυμα (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3108,16 +3124,16 @@ msgstr "Δώστε τον κωδικό"
 msgid "Protocol log"
 msgstr "Καταγραφή πρωτοκόλλου"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Χρήση: %s [ΕΠΙΛΟΓΗ]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [διεύθυνση]  άνοιγμα παραθύρου σύνθεσης"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3127,23 +3143,23 @@ msgstr ""
 "                         άνοιγμα του παραθύρου σύνθεσης μηνύματος με\n"
 "                         τα καθορισμένα αρχεία συνημμένα"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              λήψη νέων μηνυμάτων"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          λήψη νέων μηνυμάτων όλων των λογαριασμών"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 αποστολή όλων των μηνυμάτων στην ουρά"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [φάκελος]...  εμφάνιση του συνολικού αριθμού μηνυμάτων"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3151,47 +3167,47 @@ msgstr ""
 "  --status-full [φάκελος]...\n"
 "                         εμφάνιση της κατάστασης του φακέλου"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --config-dir κατάλογος  ορίζει τον κατάλογο που αποθηκεύονται τα αρχεία "
 "ρυθμίσεων"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 έξοδος από το Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                λειτουργία αποσφαλμάτωσης"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 εμφάνιση αυτού του κειμένου και έξοδος"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              εμφάνιση της έκδοσης και έξοδος"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Πατήστε ένα πλήκτρο..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Κωδικοποίηση ονομάτων αρχείων"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3216,19 +3232,19 @@ msgstr ""
 "\n"
 "Συνέχεια;"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Υπάρχει ήδη μήνυμα υπό σύνθεση. Να γίνει έξοδος;"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Μηνύματα στην ουρά"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Μερικά μηνύματα δεν έχουν σταλεί και είναι στην ουρά. Να κλείσω;"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3236,20 +3252,20 @@ msgstr ""
 "Το GnuPG δεν έχει εγκατασταθεί σωστά, ή χρειάζεται αναβάθμιση.\n"
 "Η υποστήριξη OpenPGP απενεργοποιήθηκε."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "Τρέχει ήδη ένα Sylpheed.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Μεταφορά ρυθμίσεων"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3601,15 +3617,15 @@ msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κινέ
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Προβολή/Κωδικοποίηση _χαρακτήρων/Κορεάτικη (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Προβολή/Άνοι_γμα σε νέο παράθυρο"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Προβολή/Πηγαίος _κώδικας μηνύματος"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/Προ_βολή/Ό_λων των κεφαλίδων"
 
@@ -3914,8 +3930,8 @@ msgstr "Δημιουργία κύριου παραθύρου...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -3983,7 +3999,7 @@ msgstr "Sylpheed - Προβολή φακέλων"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Προβολή μηνύματος"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Απάντηση"
 
@@ -3999,15 +4015,15 @@ msgstr "/Απάντηση στον απο_στολέα"
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση στη _λίστα ηλεκτρονικού ταχυδρομείου"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Πρ_οώθηση"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως συ_νημμένο"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Ε_κτροπή"
 
@@ -4055,20 +4071,20 @@ msgstr "Έξοδος από το πρόγραμμα;"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Επιλογή φακέλου"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Επιλογές γραμμής εντολών"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Χρήση: sylpheed [ΕΠΙΛΟΓΗ]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4098,7 +4114,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4128,15 +4144,15 @@ msgstr ""
 "εμφάνιση αυτής της βοήθειας\n"
 "εμφάνιση πληροφοριών έκδοσης"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4193,7 +4209,7 @@ msgstr "Συνημμένα"
 msgid "Message View - Sylpheed"
 msgstr "Προβολή μηνύματος - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν είναι δυνατή η αποθήκευση του αρχείου '%s'."
@@ -4214,7 +4230,7 @@ msgstr "/_Αποθήκευση ως..."
 msgid "/Save _all..."
 msgstr "/Αποθήκευση _όλων..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Ε_κτύπωση..."
 
@@ -4614,7 +4630,7 @@ msgstr "Απευθείας εισαγωγή"
 msgid "Command output"
 msgstr "Αποτέλεσμα γραμμής εντολών"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
@@ -4866,7 +4882,7 @@ msgstr " Βοήθεια σύνταξης "
 msgid "Registered actions"
 msgstr "Καθορισμένες ενέργειες"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Νέο)"
 
@@ -6235,28 +6251,28 @@ msgstr "Τύπος"
 msgid "Normal"
 msgstr "Κανονικό"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Να μην εμφανίζεται [...] ή (...) στην αρχή του θέματος στη σύνοψη"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Διαγραφή του [...] ή (...) στην αρχή του θέματος κατά την απάντηση"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Εφαρμογή σε υποφάκελους"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "χρήση επίσης στην απάντηση"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Απάντηση-Σε:"
 
@@ -6292,19 +6308,19 @@ msgstr "Συνημμένο"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6314,7 +6330,7 @@ msgid "Number"
 msgstr "Αριθμός"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Προς:"
@@ -6335,43 +6351,61 @@ msgid ""
 "the order by using the Up / Down button."
 msgstr ""
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Όνομα προτύπου"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Αποθήκευση"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Υποκατάστατο "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Σύμβολα"
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Αποθηκευμένα πρότυπα"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Πρότυπα"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Όνομα προτύπου"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Όνομα προτύπου"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Πρότυπο"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Σφάλμα μορφής προτύπου."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Διαγραφή προτύπου"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Θέλετε σίγουρα να διαγράψετε αυτό το πρότυπο;"
 
@@ -6609,7 +6643,7 @@ msgstr "Αναζήτηση για %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Αναζήτηση για %s..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
@@ -6714,7 +6748,7 @@ msgstr "_Σχετικά"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Αφαίρεση γραμματοκιβωτίου"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Όχι."
 
@@ -7283,7 +7317,7 @@ msgstr "Λήψη της λίστας ομάδων νέων..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Δεν είναι δυνατή η λήψη της λίστας ομάδων συζητήσεων."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Έγινε."
 
@@ -7292,354 +7326,354 @@ msgstr "Έγινε."
 msgid "%d newsgroups received (%s read)"
 msgstr "Λήφθηκαν %d ομάδες συζητήσεων (%s αναγνωσμένα)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Απάντ_ηση σε"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Απάντ_ηση σε/_Όλους"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Απάντ_ηση σε/_Αποστολέα"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Απάντ_ηση σε/_λίστα ηλεκτρονικού ταχυδρομείου"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Μ_ετακίνηση..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Αντιγραφή..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Ση_μείωση"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/Ση_μείωση/Ση_μείωση"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/Ση_μείωση/_Αναίρεση σημείωσης"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/Ση_μείωση/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Ση_μείωση/_Ως μη αναγνωσμένο"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Ση_μείωση/Ως αναγ_νωσμένο"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "Σήμανση Όλων ως Αναγνωσμ_ένα"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 #, fuzzy
 msgid "/_Mark/Mark all _read"
 msgstr "Σήμανση Όλων ως Αναγνωσμ_ένα"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/_Χρωματική ταμπέλα"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Σημείωση ως α_νεπιθύμητη αλληλογραφία"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Ορισμός ως επι_θυμητή αλληλογραφία"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Ε_παν-επεξεργασία"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "Προσθήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Δημιουργία _φίλτρου"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Δημιουργία _φίλτρου/_Αυτόματα"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Δημιουργία _φίλτρου/από τον απο_στολέα"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Δημιουργία _φίλτρου/από τον _παραλήπτη"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Δημιουργία _Φίλτρου/από το _θέμα"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 #, fuzzy
 msgid "Creating summary view...\n"
 msgstr "Προεπισκόπηση Ε_κτύπωσης"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Σάρωση φακέλου (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Σημείωση προόδου"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Έχουν απομείνει μερικές σημάνσεις. Να επεξεργαστούν;"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Σάρωση φακέλου (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Δεν είναι δυνατή η σύνδεση στον διακομιστή IMAP4: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "Εύρεση _ξανά"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Δεν υπάρχουν άλλα μη αναγνωσμένα μηνύματα"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μη αναγνωσμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Δεν υπάρχουν μη αναγνωσμένα μηνύματα."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Δεν υπάρχουν άλλα νέα μηνύματα"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Δεν βρέθηκαν νέα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Δεν υπάρχουν νέα μηνύματα."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Δεν βρέθηκαν νέα μηνύματα. Μετάβαση στον επόμενο φάκελο;"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 #, fuzzy
 msgid "No marked message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από την αρχή;"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 #, fuzzy
 msgid "No labeled message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μη αναγνωσμένα μηνύματα. Να γίνει αναζήτηση από το τέλος;"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 #, fuzzy
 msgid "No labeled messages."
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 #, fuzzy
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να γίνει αναζήτηση από την αρχή;"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d διαγράφηκαν"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d μετακινήθηκαν"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d αντιγράφηκαν"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " επιλεγμένα αντικείμενα"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Εγγραφή προσωρινής μνήμης περιλήψεων (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο ως αναγνωσμένο\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d είναι σημειωμένο ως μη αναγνωσμένο\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d είναι προς διαγραφή\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος(ων)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε σίγουρα να διαγράψετε τα μηνύματα από τα απορρίμματα;"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, fuzzy, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα είναι ανεπιθύμητο"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, fuzzy, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Αποτυχία ορισμού μετακίνησης ποντικιού: %d."
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Επιλογή φακέλου"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, fuzzy, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Αντιγραφή επιλεγμένων μηνυμάτων στο πρόχειρο"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Επιλογή φακέλου"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Συνέβη ένα σφάλμα κατά την επεξεργασία του μηνύματος."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Εφαρμογή φίλτρων (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "Εφαρμογή φίλτρων..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Φιλτραρίστηκαν %d μηνύματα."
diff --git a/po/es.po b/po/es.po
index 1700d131..0d68dd97 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-02-24 08:05+0100\n"
 "Last-Translator: Ricardo Mones <ricardo@mones.org>\n"
 "Language-Team: Ricardo Mones <ricardo@mones.org>\n"
@@ -318,7 +318,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No puedo crear la carpeta."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -503,11 +503,11 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración guardada.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Filtro de correo basura (manual)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Filtro de correo basura"
 
@@ -652,7 +652,7 @@ msgstr ""
 "junto con este programa; en caso contrario, escriba a la Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -688,7 +688,7 @@ msgstr ""
 "El orden de comprobación de mensajes será éste. Marque las casillas\n"
 "en la columna «G» para habilitar la descarga mediante «Recibir todo»."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -829,8 +829,8 @@ msgstr "Añadir dirección a la agenda"
 msgid "Address"
 msgstr "Dirección"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
 
@@ -838,32 +838,32 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta de la agenda"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Direcciones auto-registradas"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichero"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Fichero/Nueva _agenda"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Fichero/Nueva _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Fichero/Nuevo _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichero/Nuevo servidor _LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -871,190 +871,190 @@ msgstr "/_Fichero/Nuevo servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Fichero/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Fichero/_Editar"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Fichero/_Borrar"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Fichero/_Guardar"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichero/_Cerrar"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Dirección"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Dirección/Nueva _dirección"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Dirección/Nuevo _grupo"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Dirección/Nueva _carpeta"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Dirección/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Dirección/_Editar"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Dirección/_Borrar"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Herramientas"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Herramientas/Importar fichero _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Herramientas/Importar fichero _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ayuda"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nueva _dirección"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nuevo _grupo"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/_Pegar"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agenda de direcciones"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Dirección e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Buscar:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Añadir"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Cerrar"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Borrar dirección(es)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente la(s) dirección(es)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1063,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Sólo la _carpeta"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "La carpeta y las _direcciones"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente «%s»?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nuevo usuario, no se pudo guardar el fichero índice."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Nuevo usuario, no se pudo guardar los ficheros de direcciones"
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Antigua agenda de direcciones convertida con éxito"
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1100,7 @@ msgstr ""
 "Antigua agenda de direcciones convertida,\n"
 "no se pudo guardar el nuevo fichero índice"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1108,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "pero se crearon nuevos ficheros vacíos."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1116,7 @@ msgstr ""
 "No se pudo convertir la antigua agenda,\n"
 "no se pudieron crear los ficheros para la nueva."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1124,15 @@ msgstr ""
 "No se pudo convertir la antigua agenda\n"
 "y no se pudieron crear ficheros para una nueva."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,78 +1143,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Error en la agenda"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "No se pudo leer el índice de direcciones"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Error en la conversión de la agenda"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Conversión de la agenda"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agenda de direcciones"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Dirección de correo"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1226,11 +1226,11 @@ msgstr "Dirección común"
 msgid "Personal address"
 msgstr "Dirección personal"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1277,7 +1277,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ninguno"
 
@@ -1293,8 +1293,8 @@ msgstr "/_Añadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -1368,7 +1368,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Ver"
 
@@ -1617,7 +1617,7 @@ msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1658,7 +1658,7 @@ msgstr "¿Enviar realmente este correo a las direcciones siguientes?"
 msgid "From:"
 msgstr "Desde:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -1810,7 +1810,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Tamaño"
 
@@ -1940,28 +1940,28 @@ msgstr "Debe especificarse un nombre y un valor"
 msgid "Edit Person Data"
 msgstr "Editar datos personales"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Nombre mostrado"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Apellidos"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Nombre"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Apodo"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Dirección de correo"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2073,12 +2073,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2095,7 +2095,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2280,193 +2280,199 @@ msgstr "El fichero ya existe. ¿Desea reemplazarlo?"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Basura"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Mover carpeta..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/_Vaciar papelera"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/_Vaciar papelera"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir el árbol de carpetas"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/_Actualizar resumen"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Marcar _todo como leído"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/_Enviar mensajes en la cola"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Buscar en los mensajes"
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Ed_itar la condición de búsqueda..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Des_cargar"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Total"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Estableciendo la información de la carpeta...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Estableciendo la información de la carpeta..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Fallo al reconstruir el árbol de carpetas."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Basura"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "¿Descargar todos los mensajes bajo «%s»?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Descargar todos los mensajes"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2476,26 +2482,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada «/» al final del nombre)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede renombrar la carpeta «%s»."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2504,11 +2510,11 @@ msgstr ""
 "¿Eliminar la carpeta de búsqueda «%s» ?\n"
 "(Los mensajes no se borrarán)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Borrar carpeta de búsqueda"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2521,20 +2527,30 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede borrar la carpeta «%s»."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "No basura"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "¿Borrar todos los mensajes de la papelera?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2543,34 +2559,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2583,7 +2599,7 @@ msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Sin remitente)"
 
@@ -2654,112 +2670,112 @@ msgstr "Seleccionar la carpeta a importar"
 msgid "Select importing file"
 msgstr "Seleccionar el fichero a importar"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Especifique el nombre de la agenda y el fichero a importar."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Seleccione y ordene los nombres de campos CSV a importar."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fichero importado."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Seleccione un fichero."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Debe proporcionar un nombre de agenda de direcciones."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Error leyendo los campos CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Fichero CSV importado con éxito."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Seleccionar fichero CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nombre del fichero"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Separados por comas"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Separados por tabuladores"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Campo CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Campo de la agenda"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Ordene los campos de la agenda con los botones «Arriba» y «Abajo»"
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Arriba"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Abajo"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Agenda de direcciones :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nombre de fichero :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Registros :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importar fichero CSV a la agenda"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Siguiente"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Información de fichero"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Campos"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Finalizar"
 
@@ -2937,7 +2953,7 @@ msgstr "Saliendo"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3032,16 +3048,16 @@ msgstr "Contraseña"
 msgid "Protocol log"
 msgstr "Traza del protocolo"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre la ventana de composición"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3051,23 +3067,23 @@ msgstr ""
 "                         abre la ventana de composición con los ficheros\n"
 "                         especificados como adjuntos"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recive los mensajes nuevos"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe nuevos para todas las cuentas"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todos los mensajes en la cola"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [carpeta]...  muestra el número total de mensajes"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3075,47 +3091,47 @@ msgstr ""
 "  --status-full [carpeta]...\n"
 "                         muestra el estado de cada carpeta"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open idcarpeta/nºmsj abre el mensaje en una ventana nueva"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir nombredir  indicar el directorio con ficheros de configuración"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport numpuerto    especificar el puerto IPC para órdenes remotas"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 finalizar Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta ayuda y finaliza"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              da la información de la versión y finaliza"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Pulse cualquier tecla..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Codificación de los nombres de fichero"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3139,19 +3155,19 @@ msgstr ""
 "\n"
 "¿Desea continuar?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Está componiendo un mensaje. ¿Seguro que quiere salir?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Mensajes en cola"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hay mensajes sin enviar en la cola. ¿Salir ahora?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3159,20 +3175,20 @@ msgstr ""
 "GnuPG no esta convenientemente instalado, o es una versión antigua.\n"
 "Soporte para OpenPGP deshabilitado."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Cargando complementos..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "ya hay otro Sylpheed en ejecución.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migración de la configuración"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3514,15 +3530,15 @@ msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fuente del mens_aje"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Ver/_Todas las cabeceras"
 
@@ -3821,8 +3837,8 @@ msgstr "Creando ventana principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3891,7 +3907,7 @@ msgstr "Sylpheed - Árbol de carpetas"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Responder"
 
@@ -3907,15 +3923,15 @@ msgstr "/Responder al _remitente"
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
@@ -3959,19 +3975,19 @@ msgstr "¿Salir del programa?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta a abrir"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Opciones de línea de ordenes"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPCIÓN]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4001,7 +4017,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4031,15 +4047,15 @@ msgstr ""
 "muestra esta ayuda y termina\n"
 "muestra la información de la versión y termina"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr ""
@@ -4098,7 +4114,7 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
@@ -4119,7 +4135,7 @@ msgstr "/_Guardar como..."
 msgid "/Save _all..."
 msgstr "/Gu_ardar todo..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
@@ -4509,7 +4525,7 @@ msgstr "Entrada directa"
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
@@ -4761,7 +4777,7 @@ msgstr " Ayuda sintaxis "
 msgid "Registered actions"
 msgstr "Acciones registradas"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nueva)"
 
@@ -6115,28 +6131,28 @@ msgstr "Tipo"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "No mostrar [...] o (...) al inicio del asunto en el resumen"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Borrar [...] o (...) al inicio del asunto al responder"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Cuenta"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Aplicar en subcarpetas"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "utilizar también al responder"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
@@ -6172,19 +6188,19 @@ msgstr "Adjunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Fecha"
 
@@ -6194,7 +6210,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Para"
 
@@ -6214,43 +6230,61 @@ msgstr ""
 "Seleccione los elementos a mostrar en el resumen. Puede modificar\n"
 "el orden utilizando los botones «Arriba» y «Abajo» o arrastrándolos."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nombre de plantilla"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registrar"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Sustituir "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Plantillas registradas"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Plantillas"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nombre de plantilla"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nombre de plantilla"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Error de formato en la plantilla."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "¿Quiere borrar realmente esta plantilla?"
 
@@ -6484,7 +6518,7 @@ msgstr "Buscando %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Buscando %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6581,7 +6615,7 @@ msgstr "A_cerca de"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Buzón remoto POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "No."
 
@@ -7143,7 +7177,7 @@ msgstr "Obteniendo la lista de grupos..."
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Hecho."
 
@@ -7152,344 +7186,344 @@ msgstr "Hecho."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de noticias recibidos (%s leídos)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Al _remitente"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/A la _lista de correo"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Mover..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Marcar"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Marcar/_Marcar"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Marcar/_Desmarcar"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _no leído"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Marcar/Marcar _hilo como leído"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marca_r todos leídos"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de color"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Poner como correo _basura"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Poner como correo no bas_ura"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Re_editar"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Añadir _remitente a la agenda..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Crear regla de f_iltrado"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Crear regla de f_iltrado/_Automáticamente"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Crear regla de f_iltrado/Basada en _Desde"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear regla de f_iltrado/Basada en _Para"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear regla de f_iltrado/Basada en el _Asunto"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Revisando carpeta (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Queda alguna marca. ¿Procesarla?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "No puedo establecer la conexión IMAP4.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Buscar de nuevo"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Seleccionar carpeta a mover"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 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:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Seleccionar carpeta a copiar"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
diff --git a/po/et.po b/po/et.po
index d2a026f5..183a4129 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -326,7 +326,7 @@ msgstr ""
 "Fail %s on juba olemas.\n"
 "Ei saa kausta luua."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -508,12 +508,12 @@ msgstr "Leiti %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Häälestus on salvestatud.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Kaust"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Kaust"
@@ -658,7 +658,7 @@ msgstr ""
 "programmiga; kui ei, siis kirjuta: Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -696,7 +696,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -837,8 +837,8 @@ msgstr "Lisa aadress raamatusse"
 msgid "Address"
 msgstr "Aadress"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Märkused"
 
@@ -846,34 +846,34 @@ msgstr "Märkused"
 msgid "Select Address Book Folder"
 msgstr "Vali aadressiraamatu kaust"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registreeritud reeglid"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fail"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Fail/Uus raamat"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Fail/Uus _V-Kaart"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Fail/Uus _JPiloot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fail/Uus _Server"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -881,196 +881,196 @@ msgstr "/_Fail/Uus _Server"
 msgid "/_File/---"
 msgstr "/_Fail/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Fail/R_edigeeri"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Fail/Kustuta"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Fail/_Salvesta"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fail/Sul_ge"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/R_edaktor/_Kopeeri"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Aadress"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Aadress/Uus _Aadress"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Aadress/Uus _Grupp"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Aadress/Uus Kaust"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Aadress/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Aadress/R_edigeeri"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Aadress/Kustuta"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Tööriist"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Tööriist/Impordi _LDIF fail"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Abi"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Abi/Sellest"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Uus _Aadress"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Uus _Grupp"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Kustuta"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Kopeeri..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/R_edaktor/_Aseta"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Aadressiraamat"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Kaust"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-Posti aadress"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Kustuta"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Lisa"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Otsi"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Sulge"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Kustuta aadress(id)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Kas te tõesti soovite aadresse kustutada?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1079,38 +1079,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Ainult kataloog"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Kaust ja aadressid"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Kas tõesti kustutada `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Uus kasutaja, ei saanud salvestada indeksifaili."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Uus kasutaja, ei saanud salvestada aadressiraamatu faile."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Vana aadressiraamat uuendati edukalt."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1118,7 +1118,7 @@ msgstr ""
 "Vana aadressiraamat uuendati.\n"
 "ei saanud salvestada uut aadresside indeksifaili"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1126,7 +1126,7 @@ msgstr ""
 "Ei saanud uuendada aadressiraamatut,\n"
 "kuid loodi uued ja tühjad aadressiraamatu failid."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1134,7 +1134,7 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ei suutnud luua uusi aadressiraamatu faile."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1142,17 +1142,17 @@ msgstr ""
 "Ei suutnud uuendada aadressiraamatut,\n"
 "ja ei suutnud luua uut aadressiraamatu faile."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Aadressiraamat viiakse uude formaati"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1160,80 +1160,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Aadressiraamatu viga"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Ei suutnud lugeda aadresside indeksit"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Aadressiraamatu uuendamise viga"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Aadressiraamatu uuendamine"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Kasutajaliides"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Aadressiraamat"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "EPosti Aadress"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "V-Kaart"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPiloot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1245,11 +1245,11 @@ msgstr "Üldine aadress"
 msgid "Personal address"
 msgstr "Isiklik aadress"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Märkus"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Hoiatus"
 
@@ -1296,7 +1296,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1312,8 +1312,8 @@ msgstr "/Lis_a..."
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
@@ -1394,7 +1394,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Vaade"
 
@@ -1678,7 +1678,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
@@ -1722,7 +1722,7 @@ msgstr "Säti järgmised aadressid automaatselt"
 msgid "From:"
 msgstr "Kellelt:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Pealkiri:"
 
@@ -1870,7 +1870,7 @@ msgstr "MIME tüüp"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Suurus"
 
@@ -2003,28 +2003,28 @@ msgstr "Nimi ja Väärtus tulevad lisada."
 msgid "Edit Person Data"
 msgstr "Muuda persooni andmeid"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Ekraani nimi"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Perekonnanimi"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Eesnii"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Hüüdnimi"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Posti aadress"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2138,12 +2138,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2160,7 +2160,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigeeri JPilot sissekannet"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2353,204 +2353,210 @@ msgstr ""
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Loo uus kaust..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Kustuta kaust"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Tühjenda prügikast"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/Märk/Märgi loetuks"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Otsi kirju..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Telli uudi_stegrupp..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Eemalda uudisteg_rupp"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Loon kausta vaate...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2560,26 +2566,26 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2588,12 +2594,12 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2604,21 +2610,31 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Pealkiri"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Kas eemaldada kõik kirjad prügikastist?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2627,34 +2643,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2667,7 +2683,7 @@ msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -2747,120 +2763,120 @@ msgstr "Märgi importiv fail"
 msgid "Select importing file"
 msgstr "Märgi importiv fail"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Palun määra aadressiraamatu nimi ja fail mida importida."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Märgi ja nimeta LDIF välja nimed ümber, mida importida."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fail imporditud."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Palun valige fail."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Aadressiraamatu nimi peab olema antud."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Viga LDIF faili lugemisel."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF fail sisestati edukalt."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Vali vCard Fail"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Faili Nimi"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF Väli"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Aadressiraamat :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Üles"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Alla"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Aadressiraamat :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Faili nimi:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Salvestisi :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Impordi LDIF fail aadressiraamatusse"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Järgmine"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Eelm"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Faili-info"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF Väli"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Soome"
 
@@ -3040,7 +3056,7 @@ msgstr "Väljun"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Võtan kirja (%d /%d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3131,16 +3147,16 @@ msgstr "Sisesta parool"
 msgid "Protocol log"
 msgstr "Protokolli sündmustik"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [aadress]    ava kirjakirjutamise aken"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3150,73 +3166,73 @@ msgstr ""
 "                          ava uue kirja aken nii, et märgitud failid\n"
 "                          on manustatud kirjale"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              võta uued kirjad"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          võta uued kirjad kõigilt konto"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --saada              saada kõik järjekorras olevad kirjad"
 
-#: src/main.c:582
+#: src/main.c:585
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:583
+#: src/main.c:586
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --staatus              näita kogu kirjade arvu"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                veaotsimise režiim"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 näita seda teadet ja välju"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              näita versiooni informatsiooni ja välju"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "või vajuta 'y' klahvi.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Väljuva kirja kooditabel"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3230,19 +3246,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Kirjakirjutamine on pooleli. Tõesti lõpetame?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "kirjad järjekorras"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Mõned saatmata kirjad on järjekooras. Lõpetame?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3250,21 +3266,21 @@ msgstr ""
 "GnuPG pole installeeritud, või on liialt vana.\n"
 "OpenPGP toetus keelustatud."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "üks teine Sylpheed juba töötab.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Tegevuste konfiguratsiooni kirjutamine...\n"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3634,15 +3650,15 @@ msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Vaade/Näita kirja lähtekoodi"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Vaade/Kõik päised"
@@ -3960,8 +3976,8 @@ msgstr "Loon peamise akna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -4031,7 +4047,7 @@ msgstr "Sylpheed - kausta vaade"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/Vastan"
 
@@ -4050,15 +4066,15 @@ msgstr "/Vasta/_saatjale"
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
@@ -4105,22 +4121,22 @@ msgstr "Lõpetame programmi töö."
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Vali kaust"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Käsurida ei ole sisestatud."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kauta: %s [SEADED]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4137,7 +4153,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4154,15 +4170,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4219,7 +4235,7 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
@@ -4241,7 +4257,7 @@ msgstr "/Salveta kui..."
 msgid "/Save _all..."
 msgstr "/Salveta kui..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "Trüki..."
 
@@ -4654,7 +4670,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Käsklus"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Säti järgmised aadressid automaatselt"
 
@@ -4908,7 +4924,7 @@ msgstr " Süntaksi abi "
 msgid "Registered actions"
 msgstr "Registreeritud tegevused"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Uus)"
 
@@ -6339,28 +6355,28 @@ msgstr "Tüüp"
 msgid "Normal"
 msgstr "Normaalne"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Konto"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Vastus saata"
@@ -6400,19 +6416,19 @@ msgstr "Manus"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6422,7 +6438,7 @@ msgid "Number"
 msgstr "Number"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Kellele:"
@@ -6444,43 +6460,61 @@ msgstr ""
 "Märgi elemendid, mida näidata kirjaloendis. Te võite järjekorda\n"
 "modifitserida kasutades [Üles] ja [Alla] nuppe."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Malli nimi"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registreeri"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr "Lisa"
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Sümbolid "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registreeritud mallid"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Vormid"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Malli nimi"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Malli nimi"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Vorm"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Malli formaadi viga."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Kustuta mall"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Kas te tõesti tahate seda vormi kustutada?"
 
@@ -6729,7 +6763,7 @@ msgstr "Filtreerin..."
 msgid "Searching %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
@@ -6838,7 +6872,7 @@ msgstr "Sellest"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Ei."
 
@@ -7405,7 +7439,7 @@ msgstr "Ei saanud uudistegrupi nimistut."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ei saanud uudistegrupi nimistut."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Tehtud."
 
@@ -7414,353 +7448,353 @@ msgstr "Tehtud."
 msgid "%d newsgroups received (%s read)"
 msgstr "saadi %d uudistegruppi (%s loetud)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Vasta"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Vasta/_kõigile"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Nihuta..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/Kopeeri..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Märk"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/Märk/Märgi"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/Märk/Eemalda märk"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/Märk/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Märk/Märgi kui mitteloetud"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Märk/Märgi loetuks"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/Märk/Märgi loetuks"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/Märk/Märgi kõik loetuks"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Värviline silt"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr " Määra vaikimisi kontoks "
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Kirjutan uuesti"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Loo filtri reeglistik"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Loo filtri reeglistik/Automaatselt"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Loon kokkuvõtte vaate...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Protsessi märk"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Mõned märgid on jäänud. Protsessime selle?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates lõpust?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates lõpust?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Uusi kirju ei leidu. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Pole Rohkem märgitud kirju"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Märgitud kirju ei ole."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "*Võtan kirju päälkirja järgi..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on ülekantud"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " kirja märgitud"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Vali kaust"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Vali kaust"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
diff --git a/po/fr.po b/po/fr.po
index d584561e..24cb783f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-06-19 02:21+0200\n"
 "Last-Translator: tvY <mr.somewhere@yahoo.fr>\n"
 "Language-Team: French <gnomefr@traduc.org>\n"
@@ -328,7 +328,7 @@ msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -516,11 +516,11 @@ msgstr "Trouvé %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configuration est enregistrée.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Tri (manuel) des indésirables"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Dossier des messages indésirables"
 
@@ -664,7 +664,7 @@ msgstr ""
 "programme. Si ce n'est pas le cas, écrivez à la Free Software Foundation, "
 "Inc.,, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -702,7 +702,7 @@ msgstr ""
 "case dans la colonne G pour relever le courrier du compte \n"
 "correspondant lorsque « Tout relever » est activé"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -843,8 +843,8 @@ msgstr "Ajouter l'adresse au carnet"
 msgid "Address"
 msgstr "Adresses"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Remarques"
 
@@ -852,32 +852,32 @@ msgstr "Remarques"
 msgid "Select Address Book Folder"
 msgstr "Choisissez un dossier"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Adresses enregistrées automatiquement"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fichier"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Fichier/Nouveau _carnet d'adresses"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Fichier/Nouveau carnet _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Fichier/Nouveau carnet _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fichier/Nouveau _serveur LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -885,190 +885,190 @@ msgstr "/_Fichier/Nouveau _serveur LDAP"
 msgid "/_File/---"
 msgstr "/_Fichier/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Fichier/Édit_er"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Fichier/_Supprimer"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Fichier/En_registrer"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fichier/_Fermer"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/É_dition/_Copier"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/É_dition/Co_ller"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresse"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresse/Nouvelle _adresse"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresse/Nouveau _groupe"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresse/Nouveau _dossier"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresse/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresse/Édit_er"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresse/_Supprimer"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Outils"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Outils/Importer un fichier _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Outils/Importer un fichier _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_ide"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_ide/À _propos"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nouvelle _adresse"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nouveau _groupe"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Copier"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/Co_ller"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Carnet d'adresses"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dossier"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Rechercher :"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Supprimer"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Ajouter"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Rechercher"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Quitter"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Suppression d'adresse(s)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Voulez-vous supprimer la(les) adresse(s) sélectionnée(s) ?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1078,37 +1078,37 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "_Dossier uniquement"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Dossier et _adresses"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Voulez-vous vraiment supprimer « %s » ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nouvel utilisateur. Impossible d'enregistrer le fichier index."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr ""
 "Nouvel utilisateur, impossible d'enregistrer le fichier carnet d'adresses."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Ancien carnet d'adresses converti avec succès."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Ancien carnet d'adresses converti,\n"
 "mais impossible d'enregistrer le nouveau fichier index."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,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:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,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:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,15 +1140,15 @@ 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:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1159,78 +1159,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Erreur dans le carnet d'adresses"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Échec lors de la lecture de l'index des adresses"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Erreur de conversion du carnet d'adresses"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Conversion de carnets d'adresses"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Carnet d'adresses"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Personne"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Adresse électronique"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Groupe"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Serveur LDAP"
 
@@ -1242,11 +1242,11 @@ msgstr "Adresse courante :"
 msgid "Personal address"
 msgstr "Adresse personnelle :"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Information"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Avertissement"
 
@@ -1293,7 +1293,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Aucun"
 
@@ -1309,8 +1309,8 @@ msgstr "/_Ajouter..."
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
@@ -1384,7 +1384,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Affichage"
 
@@ -1635,7 +1635,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -1676,7 +1676,7 @@ msgstr "Vraiment envoyer ce courrier aux adresses suivantes ?"
 msgid "From:"
 msgstr "De :"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Sujet :"
 
@@ -1826,7 +1826,7 @@ msgstr "Type MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Taille"
 
@@ -1957,28 +1957,28 @@ msgstr "Un nom et une valeur doivent être donnés."
 msgid "Edit Person Data"
 msgstr "Édition des coordonnées d'une personne"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Nom affiché"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Nom"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Prénom"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Surnom"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adresse électronique"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2092,12 +2092,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2114,7 +2114,7 @@ msgid "Edit JPilot Entry"
 msgstr "Édition de données JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2297,194 +2297,200 @@ msgstr "Le fichier existe déjà. Voulez-vous le remplacer ?"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Indésirable"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Créer un _nouveau dossier..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Renommer le dossier..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Déplacer le dossier..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Supprimer le dossier"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/_Vider la corbeille"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/_Vider la corbeille"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Re_chercher les nouveaux messages"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Reconstruire l'_arborescence"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Mettre à jo_ur le résumé des messages"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Marquer comme _lu"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/_Envoyer les messages en attente"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Recherc_her dans le dossier..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Mod_ifier le motif de recherche..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Té_lécharger"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Inscription aux groupes de discussion..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Supprimer le groupe de discussion"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Création de la vue des dossiers...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Total"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des données des dossiers...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Indésirable"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Téléchargement de tous les messages dans '%s' ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Téléchargement de tous les messages"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr ""
 "Une erreur est survenue lors du téléchargement des messages dans « %s »."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2494,26 +2500,26 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de renommer le dossier « %s »."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2522,11 +2528,11 @@ msgstr ""
 "Effacer le dossier de tri « %s » ?\n"
 "Les messages existants ne seront PAS effacés du disque."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Effacer le dossier de tri"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2539,20 +2545,30 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible d'effacer le dossier « %s »."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Effacer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Acceptable"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Effacer tous les messages dans la corbeille ?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2561,34 +2577,34 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2601,7 +2617,7 @@ msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -2672,114 +2688,114 @@ msgstr "Choix du dossier à importer"
 msgid "Select importing file"
 msgstr "Choix du fichier à importer"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr ""
 "Entrer le nom du nouveau carnet d'adresses et celui du fichier à importer."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Sélectionner et modifier l'ordre des champs CSV à importer."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fichier importé."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Veuillez sélectionner une fichier."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Le nom du carnet d'adresses doit être indiqué."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Erreur lors de la lecture des champs CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Fichier CSV importé avec succès."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Sélection d'un fichier CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nom du fichier"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Spéraration par des virgules"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Ou par des tabulations"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Champ CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Champ du carnet d'adresses"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 "Modifier l'ordre dans le carnet d'adresses avec les boutons Haut et Bas."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Plus haut"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Plus bas"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Carnet d'adresses :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nom de fichier :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Enregistrements :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importation d'un fichier CSV dans un carnet d'adresses"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Suivant"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Précédent"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Propriétés du fichier"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Champs"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Terminé"
 
@@ -2957,7 +2973,7 @@ msgstr "Fermeture"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Récupération du message (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3052,16 +3068,16 @@ msgstr "Saisissez le mot de passe"
 msgid "Protocol log"
 msgstr "Journal de connexion"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilisation : %s [OPTION]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresse]    ouvrir une fenêtre de composition de message"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3072,24 +3088,24 @@ msgstr ""
 "(s)\n"
 "                         jointe(s) le(s) fichier(s) spécifié(s)"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              récupérer les nouveaux messages"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          récupérer les nouveaux messages de tous les comptes"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envoyer les messages en attente"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dossier]...  afficher le nombre total de messages"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3097,50 +3113,50 @@ msgstr ""
 "  --status-full [dossier]...\n"
 "                         afficher l'état de chaque dossier"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 "  --open [id dossier]/[numéro du message] ouvrir le message dans une "
 "nouvelle fenêtre"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dossier    indiquer le dossier contenant les fichiers de "
 "configuration"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport portnum      spécifier le port pour les commandes IPC distantes"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 quitter Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                afficher les informations de mise au point"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afficher l'aide-mémoire"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              afficher les informations de version"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Appuyez sur une touche..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Jeu de caractères du nom de fichier"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3164,23 +3180,23 @@ msgstr ""
 "\n"
 "Poursuivre ?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Une fenêtre de composition de message existe.\n"
 "Voulez-vous vraiment quitter ?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Messages en file d'attente"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Quelques messages non envoyés sont dans la file d'attente. Quitter "
 "maintenant ?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3188,20 +3204,20 @@ msgstr ""
 "GnuPG n'est pas installé correctement.\n"
 "Support OpenPGP désactivé."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Chargement des plug-ins..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "une autre session de Sylpheed existe.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migration de la configuration"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3547,15 +3563,15 @@ msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/Ouv_rir dans une nouvelle fenêtre"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Affichage/Afficher tous le_s en-têtes"
 
@@ -3854,8 +3870,8 @@ msgstr "Création de la fenêtre principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3923,7 +3939,7 @@ msgstr "Sylpheed - Dossiers"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Répondre"
 
@@ -3939,15 +3955,15 @@ msgstr "/Répondre à l'_expéditeur"
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
@@ -3991,19 +4007,19 @@ msgstr "Quitter Sylpheed ?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Choix d'un dossier à ouvrir"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Options de la ligne de commande"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilisation : sylpheed [OPTION]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4033,7 +4049,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4064,15 +4080,15 @@ msgstr ""
 "afficher l'aide-mémoire et quitter\n"
 "afficher les informations de version et quitter"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr "Option pour Windows uniquement:"
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr "spécifier le port pour les commandes IPC distantes"
 
@@ -4129,7 +4145,7 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
@@ -4150,7 +4166,7 @@ msgstr "/Enregistrer so_us..."
 msgid "/Save _all..."
 msgstr "/_Tout enregistrer..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Im_primer..."
 
@@ -4542,7 +4558,7 @@ msgstr "Texte"
 msgid "Command output"
 msgstr "Sortie"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
@@ -4796,7 +4812,7 @@ msgstr " Aide "
 msgid "Registered actions"
 msgstr "Actions enregistrées"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nouveau)"
 
@@ -6161,28 +6177,28 @@ msgstr "Type"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Ne pas afficher [...] ou (...) au début du sujet dans le résumé"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Supprimer [...] ou (...) au début du sujet lors d'une réponse"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Compte"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "utiliser également pour les réponses"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Répondre à :"
 
@@ -6218,19 +6234,19 @@ msgstr "Pièces jointes"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Date"
 
@@ -6240,7 +6256,7 @@ msgid "Number"
 msgstr "Numéro"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "À"
 
@@ -6261,43 +6277,61 @@ msgstr ""
 "modifier leur disposition, faîtes les glisser à l'aide de la souris\n"
 "ou utilisez les boutons « Plus haut » et « Plus bas »."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nom du modèle"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Enregistrer"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Remplacer "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Symboles "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Modèles enregistrés"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Modèles"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nom du modèle"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nom du modèle"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Modèle"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Erreur de format dans le modèle."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Supprimer le modèle"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Voulez-vous vraiment détruire ce modèle ?"
 
@@ -6532,7 +6566,7 @@ msgstr "Recherche %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Recherche %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6629,7 +6663,7 @@ msgstr "À _propos"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - boîte POP3 à distance"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "N°"
 
@@ -7192,7 +7226,7 @@ msgstr "Récupération de la liste des groupes de discussion..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Terminé."
 
@@ -7201,346 +7235,346 @@ msgstr "Terminé."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d groupes de discussion reçus (%s lu)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Rép_ondre à"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Rép_ondre à/_tous"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Rép_ondre à/l'_expéditeur"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Rép_ondre à/la _liste"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Déplacer..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Copier..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Marquer"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Marquer/_Marquer"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Marquer/_Démarquer"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Marquer/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marquer/Marquer comme _non lu"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marquer/Marquer comme _lu"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Marquer/Marquer le _fil comme lu"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marquer/Marquer _tous comme lus"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Co_lorer"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Marquer comme indésira_ble"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Marquer comme acc_eptable"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Réédit_er"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Ajouter l'e_xpéditeur au carnet d'adresses..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Créer une règle de f_iltrage"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Créer une règle de f_iltrage/basée sur l'_expéditeur"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Créer une règle de f_iltrage/basée sur le(s) _destinataire(s)"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Créer une règle de f_iltrage/basée sur le _sujet"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Création de la vue de l'index...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Analyse du dossier (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Impossible d'établir un session IMAP.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Chercher encore"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Pas de message non lu. Passer au dossier non lu suivant ?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Plus de nouveaux messages. Aller au prochain dossier avec des nouveaux "
 "messages?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Choisir le dossier à déplacer"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Choisir le dossier à copier"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
diff --git a/po/gl.po b/po/gl.po
index fc3f3bed..ac03bb73 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -325,7 +325,7 @@ msgstr ""
 "o Ficheiro `%s' xa existe.\n"
 "Non podo crear a carpeta."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -505,12 +505,12 @@ msgstr "Atopado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuración gardada.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Carpeta"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Carpeta"
@@ -656,7 +656,7 @@ msgstr ""
 "con este programa; en caso contrario, escriba a  Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -694,7 +694,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -835,8 +835,8 @@ msgstr "Engadir enderezo á axenda"
 msgid "Address"
 msgstr "Enderezo"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
 
@@ -844,34 +844,34 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Seleccionar carpeta da axenda"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Regas rexistradas"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Ficheiro"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Ficheiro/Nova _axenda"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Ficheiro/Nova _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Ficheiro/Novo _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Ficheiro/Novo _servidor"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -879,196 +879,196 @@ msgstr "/_Ficheiro/Novo _servidor"
 msgid "/_File/---"
 msgstr "/_Ficheiro/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Ficheiro/_Editar"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Ficheiro/_Borrar"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Ficheiro/_Gardar"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Ficheiro/_Pechar"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Enderezo"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Enderezo/Novo _enderezo"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "//_Enderezo/Novo _grupo"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Enderezo/Nova _carpeta"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Enderezo/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Enderezo/_Editar"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Enderezo/_Borrar"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar ficheiro _LDIF"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Axuda"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ayuda/_Acerca de"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Novo _enderezo"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Novo _grupo"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Borrar"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Copiar..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Editar/_Pegar"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Axenda de enderezos"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Carpeta"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Borrar"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Engadir"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Buscar"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Pechar"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Borrar enderezo(s)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "¿Borrar realmente o(s) enderezo(s)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1077,38 +1077,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Carpeta só"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Carpeta e enderezos"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "¿Borrar realmente `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Novo usuario, non se puido gardar o ficheiro índice."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Novo usuario, non se puido gardar os ficheiros de enderezos"
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Antiga axenda de enderezos convertida con éxito"
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Antiga axenda de enderezos convertida,\n"
 "non se puido gardar o novo ficheiro índice"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "pero crearonse novos ficheiros valeiros."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "Non se puido convertir a antiga axenda,\n"
 "Non se puideron crear os ficheiros para a nova."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1140,17 @@ msgstr ""
 "Non se puido convertir a antiga axenda\n"
 "e non se puideron crear ficheiros para unha nova."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Error na conversión da axenda"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Conversión da  axenda"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,81 +1158,81 @@ msgid ""
 "%s%c%s"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Error na axenda"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Non se puido ler o índice de enderezos"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversión da axenda"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Conversión da axenda"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interfaz"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Axenda de enderezos"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Persoa"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Enderezo e-mail"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1244,11 +1244,11 @@ msgstr "Enderezo común"
 msgid "Personal address"
 msgstr "Enderezo persoal"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Notificación"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1295,7 +1295,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ningún"
 
@@ -1311,8 +1311,8 @@ msgstr "/_Engadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -1392,7 +1392,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Ver"
 
@@ -1677,7 +1677,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1721,7 +1721,7 @@ msgstr "Establecer os seguintes enderezos automáticamente"
 msgid "From:"
 msgstr "Dende:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Asunto:"
 
@@ -1869,7 +1869,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Tamaño"
 
@@ -2001,28 +2001,28 @@ msgstr "Debe especificarse un Nome e un Valor"
 msgid "Edit Person Data"
 msgstr "Editar datos persoais"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Nome mostrado"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Apelidos"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Nome"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Alcume"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Enderezo e-mail"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2136,12 +2136,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2158,7 +2158,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2352,201 +2352,207 @@ msgstr ""
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Baleirar papeleira"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/_Marcar/Marcar como _leído"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Buscar nas mensaxes"
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Non hai mensaxes sin leer."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Non leídos"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Establecendo información de carpeta...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2556,26 +2562,26 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2584,12 +2590,12 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2600,21 +2606,31 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Asunto"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "¿Baleirar todas as mensaxes da papeleira?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2623,34 +2639,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2663,7 +2679,7 @@ msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -2743,120 +2759,120 @@ msgstr "Seleccionar ficheiro a importar"
 msgid "Select importing file"
 msgstr "Seleccionar ficheiro a importar"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Especifique o nome da axenda e o ficheiro a importar."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Seleccione e renomee os campos LDIF a importar."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Ficheiro importado."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Seleccione un ficheiro."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Debe proporcionar un nome de axenda de enderezos."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Erro lendo os campos LDIF."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "Ficheiro LDIF importado con éxito."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Seleccionar Ficheiro vCard"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nome do ficheiro"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "Campo LDIF"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Axenda de enderezos :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Arriba"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Axenda de enderezos :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nome de ficheiro :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Rexistros :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Importar ficheiro LDIF na axenda"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Seguinte"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Información de ficheiro"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "Campo LDIF"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Finalizar"
 
@@ -3037,7 +3053,7 @@ msgstr "Saíndo"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recuperando mensaxe (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3132,16 +3148,16 @@ msgstr "Contrasinal"
 msgid "Protocol log"
 msgstr "Rexistro do protocolo"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [dirección]  abre a fiestra de edición"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3151,73 +3167,73 @@ msgstr ""
 "                         abre a fiestra de composición con os ficheiros\n"
 "                         especificados como adxuntos"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recibe as mensaxes novas"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recibe novas mensaxes para todas as contas"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 enviar todas as mensaxes na cola"
 
-#: src/main.c:582
+#: src/main.c:585
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:583
+#: src/main.c:586
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               mostra o número total de mensaxes"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo de depuración"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 presenta esta axuda e finaliza"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              da a información da versión e finaliza"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ou pulse a tecla `y'.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Codificación para enviar"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3231,19 +3247,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Está compoñendo unha mensaxe. ¿Quere sair?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Mensaxes en cola"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hai mensaxes sin enviar na cola. ¿Sair agora?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3251,21 +3267,21 @@ msgstr ""
 "GnuPG non esta convenientemente instalado, ou é unha versión antiga.\n"
 "Soporte para OpenPGP deshabilitado."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "xa hai outro Sylpheed executándose.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "configuración das accions"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3634,15 +3650,15 @@ msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Ver/Fonte da mens_axe"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Ver/Todas as cabeceiras"
@@ -3960,8 +3976,8 @@ msgstr "Creando Fiestra principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -4033,7 +4049,7 @@ msgstr "Sylpheed - Arbre de carpetas"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Respostar"
 
@@ -4052,15 +4068,15 @@ msgstr "/Respon_der a/Ó _remitente"
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
@@ -4107,22 +4123,22 @@ msgstr "¿Sair do programa?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Seleccionar carpeta"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Non se estableceu o comando."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: %s [OPCIÓN]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4139,7 +4155,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4156,15 +4172,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4221,7 +4237,7 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
@@ -4243,7 +4259,7 @@ msgstr "/_Gardar como..."
 msgid "/Save _all..."
 msgstr "/_Gardar como..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
@@ -4656,7 +4672,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Saida do comando"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
@@ -4907,7 +4923,7 @@ msgstr " Axuda sintaxis "
 msgid "Registered actions"
 msgstr "Accions rexistradas"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nova)"
 
@@ -6339,28 +6355,28 @@ msgstr "Tipo"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "conta"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Aplicar en subcarpetas"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "utilizar tamén ó respostar"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Respostar-A:"
 
@@ -6399,19 +6415,19 @@ msgstr "Adxunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Data"
 
@@ -6421,7 +6437,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Para:"
@@ -6443,43 +6459,61 @@ msgstr ""
 "Seleccione os elementos a mostrar no resumo. Se pode modificar\n"
 "a orde utilizando os botons Arriba/Abaixo ou arrastrandolos."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nome de plantilla"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Rexistrar"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Substituír "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Símbolos "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Plantilas rexistradas"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Plantilas"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nome de plantilla"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nome de plantilla"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Plantilla"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Error de formato na plantilla."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Borrar plantilla"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "¿Quere borrar realmente esta plantilla?"
 
@@ -6728,7 +6762,7 @@ msgstr "Filtrando..."
 msgid "Searching %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Sin data)"
 
@@ -6836,7 +6870,7 @@ msgstr "Acerca de"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Non."
 
@@ -7404,7 +7438,7 @@ msgstr "Non se pode obter a lista de grupos."
 msgid "Can't retrieve newsgroup list."
 msgstr "Non se pode obter a lista de grupos."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Feito."
 
@@ -7413,353 +7447,353 @@ msgstr "Feito."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de novas recibidos (%s leídos)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Mover..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Marcar"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Marcar/_Marcar"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Marcar/_Desmarcar"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _non leído"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Marcar/Marcar como _leído"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marca_r todos leídos"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de cor"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "conta por defecto"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "conta por defecto"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Re_editar"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Crear Regra de f_iltrado"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Crear Regra de f_iltrado/_Automáticamente"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Crear Regra de f_iltrado/Baseada en _Dende"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear Regra de f_iltrado/Baseada en _Para"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear Regra de f_iltrado/Baseada no _Asunto"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Queda algunha marca. ¿Procesa-la?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Búscar de novo"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Non hai mensaxes sen ler. ¿Ir á carpeta seguinte?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Non hai máis mensaxes novas. ¿Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non leídos, %d totales (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non leídos, %d totales"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Seleccionar carpeta"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Seleccionar carpeta"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
diff --git a/po/hr.po b/po/hr.po
index b66d3f37..d4bd6775 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -327,7 +327,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu stvoriti spis."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -511,12 +511,12 @@ msgstr "Pronađen %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Spis"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Spis"
@@ -663,7 +663,7 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -701,7 +701,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -839,8 +839,8 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Bilješke"
 
@@ -848,35 +848,35 @@ msgstr "Bilješke"
 msgid "Select Address Book Folder"
 msgstr "Odaberite spis adresara"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _V-kartica"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 #, fuzzy
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _J-Pilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _poslužitelj"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -884,196 +884,196 @@ msgstr "/_Datoteka/Novi _poslužitelj"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Uredi"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Spremi"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Uredi/_Kopiraj"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _spis"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Uredi"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Novi _spis"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiraj..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/U_baci"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Spis"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Potraga"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Potraga"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Uistinu obrisati adresu/e?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1082,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Obriši spis"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo spis"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Spis i adrese"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Uistinu obrisati `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu spretmiti index datoteku."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu spremiti datoteke adresara."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1121,7 @@ msgstr ""
 "Stari adresar ne može biti unešen,\n"
 "ne mogu spremiti novu index datoteku adresara."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Ne mogu unjeti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1137,7 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "ne mogu kreirati nove datoteke adresara."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1145,17 @@ msgstr ""
 "Ne mogu unjeti adresar,\n"
 "i ne mogu stvoriti nove datoteke adresara."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,74 +1163,74 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Sučelje"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "E-mail adresa"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "V-kartica"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 #, fuzzy
 msgid "JPilot"
 msgstr "J-Pilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP Poslužitelj"
 
@@ -1242,11 +1242,11 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Osobne adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Obavijest"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Upozorenje"
 
@@ -1293,7 +1293,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ništa"
 
@@ -1309,8 +1309,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
@@ -1392,7 +1392,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Pregled"
 
@@ -1685,7 +1685,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1729,7 +1729,7 @@ msgstr "Automatski postavi slijedeće adrese"
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -1875,7 +1875,7 @@ msgstr "MIME tip"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Veličina"
 
@@ -2009,28 +2009,28 @@ msgstr "Ime i iznos moraju biti upisani."
 msgid "Edit Person Data"
 msgstr "Uredi osobne podatke"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Prikaz imena"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Prezime"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Nadimak"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-mail adresa"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2144,12 +2144,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2166,7 +2166,7 @@ msgid "Edit JPilot Entry"
 msgstr "Uredite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2359,208 +2359,214 @@ msgstr ""
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uključen u ime spisa."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi spis..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Obriši spis"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Isprazni smeće"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Šalje odložene poruke"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Pribilježi se na _news grupu..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Ukloni news _grupu"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2570,26 +2576,26 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2598,12 +2604,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2614,21 +2620,31 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Tema"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Isprazniti sve poruke u smeću?"
+
+#: src/folderview.c:2793
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2637,35 +2653,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2678,7 +2694,7 @@ msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -2758,125 +2774,125 @@ msgstr "Odaberite datoteku za uvoz"
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr ""
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr ""
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 #, fuzzy
 msgid "File imported."
 msgstr "Ime datoteke"
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Molim, odaberite datoteku."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Ime adresara mora biti unešeno."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Greška pri unosu LDIF datoteke."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "Stari adresar uspješno unešen."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Odaberite V-kartica datoteku"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 #, fuzzy
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr ""
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "Odaberite LDIF datoteku"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adresar"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Gore"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Dolje"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 #, fuzzy
 msgid "Address Book :"
 msgstr "Adresar"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 #, fuzzy
 msgid "File Name :"
 msgstr "Ime datoteke"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr ""
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Unesi LDIF datoteku u Adresar"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Slijedeća"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 #, fuzzy
 msgid "Prev"
 msgstr "Postav"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 #, fuzzy
 msgid "File Info"
 msgstr "Ime datoteke"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "Odaberite LDIF datoteku"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr ""
 
@@ -3063,7 +3079,7 @@ msgstr "Izlazim"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3156,90 +3172,90 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
 "                         attached"
 msgstr ""
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prima sve poruke sa svih računa"
 
-#: src/main.c:581
+#: src/main.c:584
 #, fuzzy
 msgid "  --send                 send all queued messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:582
+#: src/main.c:585
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:583
+#: src/main.c:586
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --recive              prikazuje broj poruka"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug način"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikazuje ovu pomoć i izlazi"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3253,19 +3269,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Pisanje poruke postoji. Uistinu prekinuti?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlane poruke su odložene. Izaći odmah?"
 
-#: src/main.c:888
+#: src/main.c:894
 #, fuzzy
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
@@ -3274,21 +3290,21 @@ msgstr ""
 "GnuPG nije pravilno instaliran.\n"
 "OpenPGP podrška je onemogućena."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem konfiguraciju filtera...\n"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3702,16 +3718,16 @@ msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 #, fuzzy
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
@@ -4050,8 +4066,8 @@ msgstr "Kreiram glavne prozore...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4122,7 +4138,7 @@ msgstr ""
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/Od_govori"
 
@@ -4141,16 +4157,16 @@ msgstr "/Odgovor_i pošiljatelju"
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
@@ -4198,22 +4214,22 @@ msgstr "Izlaz iz ovog programa?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Odaberite spis"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Ime zaglavlja nije postavljeno."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4230,7 +4246,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4247,15 +4263,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4314,7 +4330,7 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
@@ -4336,7 +4352,7 @@ msgstr "/S_premi kao"
 msgid "/Save _all..."
 msgstr "/S_premi kao"
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Is_piši"
 
@@ -4750,7 +4766,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi slijedeće adrese"
 
@@ -4996,7 +5012,7 @@ msgstr ""
 msgid "Registered actions"
 msgstr "Registrirani obrasci"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -6426,28 +6442,28 @@ msgstr "Tip"
 msgid "Normal"
 msgstr ""
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Račun"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Odvovori-Na"
@@ -6487,19 +6503,19 @@ msgstr "Prilog"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Datum"
 
@@ -6509,7 +6525,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6531,43 +6547,61 @@ msgstr ""
 "Odaberite pojedinosti za prikaz. Možete modificirati poredak\n"
 "koristeći Gore / Dolje tipke, ili povlačenjem mišem."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Ime obrasca"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Unesi"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Zamjeni "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registrirani obrasci"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Obrasci"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Ime obrasca"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Ime obrasca"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Obrazac"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Greška formata obrasca."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Briši obrazac"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Uistinu obrisati ovaj obrazac?"
 
@@ -6819,7 +6853,7 @@ msgstr "Filtriranje..."
 msgid "Searching %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6928,7 +6962,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Ne."
 
@@ -7497,7 +7531,7 @@ msgstr "Ne mogu pronaći listu news grupa."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Gotovo."
 
@@ -7506,365 +7540,365 @@ msgstr "Gotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 #, fuzzy
 msgid "/Repl_y to"
 msgstr "/Odgovori svi_ma"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 #, fuzzy
 msgid "/Repl_y to/_all"
 msgstr "/Odgovori svi_ma"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 #, fuzzy
 msgid "/Repl_y to/_sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 #, fuzzy
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Premjesti..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopiraj..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Označi"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Označi/_Označi"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Označi/_Ukloni oznaku"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Označi/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Označi/Označi kao _nepročitano"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označi/Označi sve _pročitano"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Pre-_uredi"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Kreiram pregled održavanja...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Nema više label poruka"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Prihvaćam poruke po temi..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premješteno"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Odaberite spis"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Odaberite spis"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
diff --git a/po/hu.po b/po/hu.po
index 3f988664..4934745a 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-3.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-02-13 14:38+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@uhuklub.hu>\n"
 "Language-Team: Hungarian <NONE>\n"
@@ -320,7 +320,7 @@ msgstr ""
 "`%s' fájl már létezik.\n"
 "Mappa nem hozható létre."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -505,11 +505,11 @@ msgstr "Találat %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Beállítások tárolva.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Levélszemét szűrés (kézi)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Levélszemét szűrés"
 
@@ -655,7 +655,7 @@ msgstr ""
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. http://www."
 "fsf.org "
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -692,7 +692,7 @@ msgstr ""
 "letöltése'\n"
 "funkció bekapcsolásához tegyen pipát a 'G' oszlopban levő négyzetbe!"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -834,8 +834,8 @@ msgstr "Cím hozzáadása a címjegyzékhez"
 msgid "Address"
 msgstr "Cím"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Megjegyzések"
 
@@ -843,32 +843,32 @@ msgstr "Megjegyzések"
 msgid "Select Address Book Folder"
 msgstr "Címjegyzék mappa választás"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Auto-regisztrált cím"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fájl"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Fájl/Új _Címjegyzék"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Fájl/Új _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Fájl/Új _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fájl/Új _LDAP Szerver"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -876,190 +876,190 @@ msgstr "/_Fájl/Új _LDAP Szerver"
 msgid "/_File/---"
 msgstr "/_Fájl/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Fájl/_Szerkesztés"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Fájl/_Törlés"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Fájl/_Mentés"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fájl/_Bezárás"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/S_zerkesztés"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/S_zerkesztés/_Másolás"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/S_zerkesztés/_Beillesztés"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Cím"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Cím/Új _cím"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Cím/Új cso_port"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Cím/Új _mappa"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Cím/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Cím/_Szerkesztés"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Cím/_Törlés"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Eszközök"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Eszközök/_LDIF fájl importálása"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Eszközök/_CSV fájl importálása"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Súgó"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Súgó/_Névjegy"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Új _cím"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Új cso_port"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Törlés"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Másolás"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/_Beillesztés"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Címjegyzék"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mappa"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Email cím"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Keresés:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Törlés"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Keresés"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "Be_zárás"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Cím(ek) törlése"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Tényleg töröljem a cím(ek)et?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1068,36 +1068,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Cs_ak mappa"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Mappa és _címek"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tényleg törli `%s' elemet?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Az új felhasználó nem tudja menteni az index fájlt."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 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:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "A régi címjegyzék konvertálása sikerült."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1105,7 +1105,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:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1113,7 +1113,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:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1121,7 +1121,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:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1129,15 +1129,15 @@ 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:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1148,74 +1148,74 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Címjegyzék hiba"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "A címindex nem olvasható"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Címjegyzék konvertálási hiba"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Címjegyzék konvertálása"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Illesztő"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Címjegyzék"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Személy"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Email cím"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Csoport"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP Szerver"
 
@@ -1227,11 +1227,11 @@ msgstr "Általános cím"
 msgid "Personal address"
 msgstr "Személyes cím"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Megjegyzés"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
@@ -1278,7 +1278,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Semmi"
 
@@ -1294,8 +1294,8 @@ msgstr "/_Hozzáadás..."
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
@@ -1369,7 +1369,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/S_zerkesztés/A_utomata tördelés"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Nézet"
 
@@ -1618,7 +1618,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Egy több részes levél egy darabja nem hozzáférhető."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
@@ -1659,7 +1659,7 @@ msgstr "Tényleg elküldi ezt a levelet a következő címekre?"
 msgid "From:"
 msgstr "Feladó:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tárgy:"
 
@@ -1812,7 +1812,7 @@ msgstr "MIME típus"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Méret"
 
@@ -1942,28 +1942,28 @@ msgstr "Egy nevet és értéket meg kell adnia."
 msgid "Edit Person Data"
 msgstr "Személy adatainak szerkesztése"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Név kijelzése"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Vezetéknév"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Keresztnév"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Becenév"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Email cím"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Álnév"
 
@@ -2075,12 +2075,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2097,7 +2097,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot bejegyzés szerkesztése"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2280,193 +2280,199 @@ msgstr "A fájl már létezik. Biztos benne, hogy lecseréli?"
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Levélszemét"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Új _mappa létrehozása..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Mappa át_nevezése..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/Mappa át_helyezése..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Mappa _törlése"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/_Kuka ürítése"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/_Kuka ürítése"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Ú_j levelek ellenőrzése"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/_Mappafa újraépítése"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Ö_sszegzés frissítése"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Mindet olvasottként meg_jelöl"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "A _várakozó levelek elküldése"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Ü_zenetek keresése..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Keresési feltételek _módosítása..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Le_töltés"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Hírcsoport _előfizetése..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Hírcsoport e_ltávolítása"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Mappa nézet létrehozása...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Új"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Összes"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Mappa információ beállítása...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Mappafa újraépítése"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A mappafa újra fog épülni. Folytatja?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa újraépítése sikertelen."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Új levelek keresése minden mappában..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Levélszemét"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Levelek letöltése a(z) %s mappába ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Összes levél letöltése a(z) %s mappába?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Összes levél letöltése"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba lépett fel a(z) %s mappába történő levelek letöltésekor."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2476,26 +2482,26 @@ msgstr ""
 "(Ha egy almappákat tartalmazó mappát szeretne létrehozni,\n"
 "akkor tegyen egy `/' jelet a név végére)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' mappa nem nevezhető át."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2504,11 +2510,11 @@ msgstr ""
 "A(z) `%s' keresési mappa törlése?\n"
 "Az eredeti levelek nem törlődnek."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Keresési mappa törlése"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2521,20 +2527,30 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' mappa nem távolítható el."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden levél törlése a kukából?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Nem levélszemét"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Minden levél törlése a kukából?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2543,34 +2559,34 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(A levelek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli `%s' IMAP4 fiókot?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 fiók törlése"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli `%s' hírcsoportot?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli `%s' hírfiókot?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Hírfiók törlése"
 
@@ -2583,7 +2599,7 @@ msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -2652,112 +2668,112 @@ msgstr "Importálandó mappa választása"
 msgid "Select importing file"
 msgstr "Importálandó fájl választása"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Adja meg a címjegyzék mappa és fájl nevét az importáláshoz."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "CSV mezőnevek kiválasztása és átnevezése az importhoz."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fájl importálva."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Válasszon egy fájlt."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Címjegyzék nevet meg kell adnia."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Hiba a CSV mezők olvasásakor."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "CSV fájl importálása sikerült."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "CSV fájl kiválasztása"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Fájlnév"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Vesszővel elválasztott"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Tabbal elválasztott"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "CSV mező"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Címjegyzék mező"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Címjegyzék mezőinek átrendezése a Fel Le gombokkal."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Fel"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Le"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Címjegyzék:"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Fájlnév:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Rekordok:"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "CSV fájl importálása a címjegyzékbe"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Következő"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Előző"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Fájl információ"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Mezők"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Vége"
 
@@ -2935,7 +2951,7 @@ msgstr "Kilépés"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Levél letöltése (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3030,16 +3046,16 @@ msgstr "Adja meg a jelszót"
 msgid "Protocol log"
 msgstr "Protokoll napló"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Használat: %s [OPCIÓ]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [cím]    szerkesztőablak megnyitása"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3049,23 +3065,23 @@ msgstr ""
 "                          szerkesztőablak nyitása a megadott fájl(ok)\n"
 "                          csatolásával"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              új levelek letöltése"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          új levelek letöltése minden fióknál"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 minden várakozó levél küldése"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mappa]...    kiírja a levelek számát"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3073,46 +3089,46 @@ msgstr ""
 "  --status-full [mappa]...\n"
 "                       megjeleníti minden egyes mappa állapotát"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum  levél megnyitása új ablakban"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    a konfigurációs fájlokat tároló mappa megadása"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portszám      IPC távoli parancsok portjának megadása"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                kilépés a Sylpheedből"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                hibakereső üzemmód"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 e segítség megjelenítése és kilépés"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              verzió információk kiírása és kilépés"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Nyomjon meg egy billentyűt..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Fájlnév karakterkódolása"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3136,19 +3152,19 @@ msgstr ""
 "\n"
 "Folytatja?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Levél szerkesztés alatt. Tényleg kilép?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Várakozó levelek"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vannak elküldetlen levelek. Kilépés most?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3156,20 +3172,20 @@ msgstr ""
 "A GnuPG nincs megfelelően telepítve, vagy túl régi a verziója.\n"
 "OpenPGP támogatás kikapcsolva."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Kiegészítések betöltése..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "egy másik Sylpheed már fut.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Beállítások migrálása"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3511,15 +3527,15 @@ msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Nézet/Ü_zenet forrása"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Nézet/_Összes fejléc"
 
@@ -3818,8 +3834,8 @@ msgstr "Főablak létrehozása...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -3887,7 +3903,7 @@ msgstr "Sylpheed - Mappanézet"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Levélnézet"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Válasz"
 
@@ -3903,15 +3919,15 @@ msgstr "/Válasz a _küldőnek"
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
@@ -3956,19 +3972,19 @@ msgstr "Kilépés a programból?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Megnyitandó mappa kiválasztása"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Parancssori opciók"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Használat: sylpheed [OPCIÓ]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3998,7 +4014,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4028,15 +4044,15 @@ msgstr ""
 "megjeleníti ezt a súgót, majd kilép\n"
 "kiírja a verzió információkat, majd kilép"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portszám      IPC távoli parancsok portjának megadása"
@@ -4094,7 +4110,7 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Levélnézet - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
@@ -4115,7 +4131,7 @@ msgstr "/Menté_s másként..."
 msgid "/Save _all..."
 msgstr "/M_inden mentése..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Nyomtat..."
 
@@ -4506,7 +4522,7 @@ msgstr "Közvetlen bemenet"
 msgid "Command output"
 msgstr "Parancskimenet"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
@@ -4759,7 +4775,7 @@ msgstr " Szintaxis súgó "
 msgid "Registered actions"
 msgstr "Regisztrált műveletek"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Új)"
 
@@ -6117,28 +6133,28 @@ msgstr "Típus"
 msgid "Normal"
 msgstr "Normális"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Ne mutassa a [...] vagy (...) szöveget a tárgy mezőben összegzéskor"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Válasz esetén törölje a [...] vagy (...) szöveget a tárgy mezőből"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Fiók"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Alkalmazás almappákra"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "válasznál is használja"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Válaszcím:"
 
@@ -6174,19 +6190,19 @@ msgstr "Csatolás"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Dátum"
 
@@ -6196,7 +6212,7 @@ msgid "Number"
 msgstr "Sorszám"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Címzett"
 
@@ -6216,43 +6232,61 @@ msgstr ""
 "Válassza ki az áttekintő nézetben megjeleníteni kívánt elemeket.\n"
 "A sorrendjük a Fel / Le gombbal változtatható meg."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Sablon név"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Regisztráció"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Helyettesít "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Szimbólumok "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Regisztrált sablonok"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Sablonok"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Sablon név"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Sablon név"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Sablon"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Sablon formátumhiba."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Sablon törlése"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Tényleg törölni szeretné ezt a sablont?"
 
@@ -6486,7 +6520,7 @@ msgstr "%s keresése (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "%s keresése..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
@@ -6583,7 +6617,7 @@ msgstr "_Névjegy"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 Távoli postaláda"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Ssz."
 
@@ -7141,7 +7175,7 @@ msgstr "Hírcsoport lista letöltése..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nem lehet olvasni a hírcsoportok listáját."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Kész."
 
@@ -7150,344 +7184,344 @@ msgstr "Kész."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d hírcsoport letöltve (%s olvasott)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Vál_asz másnak"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Vál_asz másnak/_mindenkinek"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Vál_asz másnak/a _feladónak"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Vál_asz másnak/_levelezőlistának"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/M_ozgatás..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Másolás..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Kijelöl"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Kijelöl/_Kijelöl"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Kijelöl/Kijelölés _törlése"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Kijelöl/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Kijelöl/O_lvasatlanként jelöl"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Kijelöl/_Olvasottként jelöl"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Kijelöl/_Olvasott szálként jelöl"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Kijelöl/_Minden olvasottat kijelöl"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/_Színes címke"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Beállítás levélszemétként"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Beállítás nem levélszemétként"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Új_raszerkeszt"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Küldő hozzáadása a cím_jegyzékhez..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Szűrési szabály _létrehozása"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Szűrési szabály _létrehozása/_Automatikusan"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Szűrési szabály _létrehozása/_Feladó alapján"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Szűrési szabály létrehozása/_Címzett alapján"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Szűrési szabály _létrehozása/_Tárgy alapján"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Áttekintő nézet létrehozása...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "(%s) (%d) mappa átvizsgálása..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Kijelöltek feldolgozása"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Maradt még néhány kijelölt. Feldolgoás?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "(%s) mappa átvizsgálása..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Nem lehet IMAP kapcsolatot létesíteni.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "Keresés ú_jra"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Nincs további olvasatlan levél"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nem található olvasatlan levél. Keresés a végéről?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Nincs olvasatlan levél.."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nem található olvasatlan levél. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Nincs több új levél"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Nem található új levél. Keresés a végéről?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Nincs új levél."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nem található új levél. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Nincs további kijelölt levél"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Nem található kijelölt levél. Keresés a végéről?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Nincs kijelölt levél."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem található kijelölt levél. Keresés az elejéről?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Nincs további címkézett levél."
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem található címkézett levél. Keresés a végéről?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Nincs címkézett levél."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem található címkézett levél. Keresés az elejéről?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Levelek rendezése tárgy szerint..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " elem kiválasztva"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d új, %d olvasatlan, %d összesen"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása a levelek adataiból..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása a levelek adataiból..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d levél kijelölve\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d levél olvasottnak jelölve\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d levél olvasatlannak jelölve\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d levél törlésre kijelölve\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Levél(ek) törlése"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az levél(eke)t a kukából?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező levelek törlése..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d levél kijelölésének megszüntetése\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d levél kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Áthelyezendő mappa kiválasztása"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d levél kijelölve a(z) %s mappába másolásra\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 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:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Másolandó mappa kiválasztása"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Hiba a levelek feldolgozása közben."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Szálak felépítése..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Szál lebontása..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d levél szűrése megtörtént."
diff --git a/po/it.po b/po/it.po
index 5147baf9..2ac67325 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.4.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2008-01-26 09:42+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it,dbodei@katamail.com>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -320,7 +320,7 @@ msgstr ""
 "Il file «%s» esiste già.\n"
 "Impossibile creare la cartella."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -505,11 +505,11 @@ msgstr "Trovato %s\n"
 msgid "Configuration is saved.\n"
 msgstr "La configurazione è stata salvata.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Filtro mail spazzatura (manuale)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Filtro mail spazzatura"
 
@@ -654,7 +654,7 @@ msgstr ""
 "insieme a questo programma; in caso contrario, scrivete alla Free Software "
 "Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -693,7 +693,7 @@ msgstr ""
 "nella\n"
 "colonna «G» per consentire il recupero dei messaggi attraverso «Ricevi tutti»."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -834,8 +834,8 @@ msgstr "Aggiunta dell'indirizzo alla rubrica"
 msgid "Address"
 msgstr "Indirizzo"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Note"
 
@@ -843,33 +843,33 @@ msgstr "Note"
 msgid "Select Address Book Folder"
 msgstr "Selezione della cartella della rubrica"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Modelli registrati"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_File"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_File/Nuova _rubrica"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_File/Nuova _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_File/Nuovo _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_File/Nuovo server _LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -877,190 +877,190 @@ msgstr "/_File/Nuovo server _LDAP"
 msgid "/_File/---"
 msgstr "/_File/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_File/_Modifica"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_File/_Elimina"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_File/_Salva"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_File/_Chiudi"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Modifica/_Copia"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Modifica/_Incolla"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Indirizzo"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Indirizzo/Nuovo _indirizzo"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Indirizzo/Nuovo _gruppo"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Indirizzo/Nuova _cartella"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Indirizzo/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Indirizzo/_Modifica"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_indirizzo/_Elimina"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/S_trumenti"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/S_trumenti/Importa file _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/S_trumenti/Importa file _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_iuto"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_iuto/I_nformazioni"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nuovo _indirizzo"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nuovo _gruppo"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Copia"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/_Incolla"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Rubrica"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Cartella"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Indirizzo e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ricerca:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Elimina"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr " Aggiungi "
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Cerca"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Chiudi"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Elimina l'indirizzo(i)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Eliminare l'indirizzo(i)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,36 +1070,36 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "_Solo la cartella"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Cartella e _indirizzi"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Eliminare «%s» ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nuovo utente, impossibile salvare il file indice."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Nuovo utente, impossibile salvare i file della rubrica."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "La vecchia rubrica è stata convertita con successo."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1107,7 @@ msgstr ""
 "Vecchia rubrica convertita,\n"
 "impossibile salvare il nuovo file indice dell'indirizzo"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "ma ho creato nuovi file vuoti della rubrica."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1123,7 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1131,15 @@ msgstr ""
 "Impossibile convertire la rubrica,\n"
 "e impossibile creare i nuovi file della rubrica."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Conversione della rubrica"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1147,78 +1147,78 @@ msgid ""
 "%s%c%s"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Impossibile leggere l'indice dell'indirizzo"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Errore di conversione della rubrica"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Errore rubrica"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interfaccia"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Rubrica"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Persona"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Indirizzo email"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Gruppo"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1230,11 +1230,11 @@ msgstr "Indirizzo comune"
 msgid "Personal address"
 msgstr "Indirizzo personale"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Avviso"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Avvertimento"
 
@@ -1281,7 +1281,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Niente"
 
@@ -1297,8 +1297,8 @@ msgstr "/_Aggiungi..."
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
@@ -1372,7 +1372,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Visualizza"
 
@@ -1621,7 +1621,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
@@ -1664,7 +1664,7 @@ msgstr "Imposta automaticamente i seguenti indirizzi"
 msgid "From:"
 msgstr "Da:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Oggetto:"
 
@@ -1822,7 +1822,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Dimensione"
 
@@ -1952,28 +1952,28 @@ msgstr "Devono essere forniti un nome e un valore."
 msgid "Edit Person Data"
 msgstr "Modifica i dati della persona"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Nome da visualizzare"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Ultimo nome"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Primo nome"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Nick"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Indirizzo e-mail"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2086,12 +2086,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2108,7 +2108,7 @@ msgid "Edit JPilot Entry"
 msgstr "Modifica la voce JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2301,194 +2301,200 @@ msgstr "Il file esiste gia. Sostituirlo?"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Spazzatura"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Sposta cartella..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Elimina cartella"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Svuo_ta cestino"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Svuo_ta cestino"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Controllo nuovi messaggi"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/R_icostruisci l'albero cartella"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/A_ggiorna sommario"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Segna come tutto _letto"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Invia i me_ssaggi accodati"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Ricerca _messaggi..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Mod_ifica condizioni di ricerca..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Sc_arica"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Iscrizione newsgroup..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Rimuovi newsgroup..."
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Totale"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sarà ricostruito. Continuo?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Spazzatura"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Scarico tutti i messaggi in «%s» ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Scarico tutti i messaggi"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2498,26 +2504,26 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossibile rinominare la cartella «%s»."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2526,11 +2532,11 @@ msgstr ""
 "Rimuovere la cartella di ricerca «%s» ?\n"
 "I messaggi reali non saranno eliminati."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Elimina la cartella di ricerca"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2544,20 +2550,30 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Non spazzatura"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Svuotare tutti i messaggi nel cestino?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2566,34 +2582,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -2606,7 +2622,7 @@ msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -2686,112 +2702,112 @@ msgstr "Selezione del file da importare"
 msgid "Select importing file"
 msgstr "Selezione del file da importare"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Specificare il nome della rubrica e del file da importare."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Seleziona e riordina i nomi del campo CSV da importare."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "File importato."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Seleziona un file."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Deve essere fornito un nome per la rubrica."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Errore leggendo i campi CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "File CSV importato con successo."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Seleziona il file CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nome del file"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Separato da virgola"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Separato da tab"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Campo CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Campo rubrica"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Riordina i campi della rubrica con i tasti sù e giù."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Su"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Giù"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Rubrica :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nome del file:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Record :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importazione del file CSV nella rubrica"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Successivo"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Precedente"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Info sul file"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Campi"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Fine"
 
@@ -2970,7 +2986,7 @@ msgstr "Esco"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recupero il messaggio (%d di %d) (%s di %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3065,16 +3081,16 @@ msgstr "Inserire la password"
 msgid "Protocol log"
 msgstr "Log del protocollo"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPZIONE]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [indirizzo]  apre una finestra di composizione"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3084,23 +3100,23 @@ msgstr ""
 "                         apre la finestra di composizione con allegati\n"
 "                         i file specificati"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              riceve i nuovi messaggi"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          riceve i nuovi messaggi di tutti gli account"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 invia tutti i messaggi accodati"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [cartella]... mostra il numero totale dei messaggi"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3108,47 +3124,47 @@ msgstr ""
 "  --status-full [cartella]...\n"
 "                         mostra lo stato di ogni cartella"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum apre il messaggio in una nuova finestra"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    specifica la directory che contiene i file di "
 "configurazione"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      specifca la porta per i comandi IPC da remoto"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 esce da Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                modalità di debug"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 mostra questo aiuto ed esce"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informazioni sulla versione ed esce"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Premere un tasto qualsiasi..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Codifica nome file"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3172,19 +3188,19 @@ msgstr ""
 "\n"
 "Continuo?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "C'è un messaggio in composizione. Uscire?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Messaggi accodati"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Ci sono messaggi non spediti in «Coda». Uscire ora ?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3192,20 +3208,20 @@ msgstr ""
 "GnuPG non è installato correttamente, o questa versione è troppo vecchia.\n"
 "Il supporto per OpenPGP è disabilitato."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "un altro Sylpheed è già in esecuzione.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migrazione della configurazione"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3554,15 +3570,15 @@ msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Visualizza/Sorgente messagg_io"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Visualizza/Tutte le intesta_zioni"
 
@@ -3863,8 +3879,8 @@ msgstr "Creazione della finestra principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -3933,7 +3949,7 @@ msgstr "Sylpheed - Vista cartella"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
@@ -3949,15 +3965,15 @@ msgstr "/Rispondi _al mittente"
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
@@ -4001,20 +4017,20 @@ msgstr "Uscire da questo programma?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Selezione della cartella"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Opzioni della linea di comando"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPZIONE]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4044,7 +4060,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4074,15 +4090,15 @@ msgstr ""
 "mostra questo aiuto ed esce\n"
 "mostra informazioni sulla versione ed esce"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      specifca la porta per i comandi IPC da remoto"
@@ -4140,7 +4156,7 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
@@ -4161,7 +4177,7 @@ msgstr "/Sa_lva come..."
 msgid "/Save _all..."
 msgstr "/Salva _tutto..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Stam_pa..."
 
@@ -4556,7 +4572,7 @@ msgstr "Input diretto"
 msgid "Command output"
 msgstr "Output del comando"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
@@ -4809,7 +4825,7 @@ msgstr " Aiuto sintassi "
 msgid "Registered actions"
 msgstr "Azioni registrate"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nuovo)"
 
@@ -6177,28 +6193,28 @@ msgstr "Tipo"
 msgid "Normal"
 msgstr "Normale"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Non mostrare [...] o (...) all'inizio dell'oggetto nel sommario"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Elimina [...] o (...) all'inizio dell'oggetto nella risposta"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Account"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Applica alle sottocartelle"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "usa anche nella risposta"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Rispondi a:"
 
@@ -6234,19 +6250,19 @@ msgstr "Allegato"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Data"
 
@@ -6256,7 +6272,7 @@ msgid "Number"
 msgstr "Numero"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "A"
 
@@ -6277,43 +6293,61 @@ msgstr ""
 "Selezionare le voci da visualizzare nella vista sommario.\n"
 "Si può modificare l'ordine con i tasti Su / Giù."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nome del modello"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registra "
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Sostituisci "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Modelli registrati"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Modelli"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nome del modello"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nome del modello"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Modello"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Errore nel formato del modello."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Elimina il modello"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Eliminare questo modello?"
 
@@ -6550,7 +6584,7 @@ msgstr "Ricerca in %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Ricerca in %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
@@ -6653,7 +6687,7 @@ msgstr "Informazioni"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "No."
 
@@ -7229,7 +7263,7 @@ msgstr "Recupero la lista dei newsgroup..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossibile recuperare la lista dei newsgroup."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Fatto."
 
@@ -7238,348 +7272,348 @@ msgstr "Fatto."
 msgid "%d newsgroups received (%s read)"
 msgstr "ricevuti %d newsgroup (%s letti)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Rispondi _a"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Rispondi _a/t_utti"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Rispondi _a/_mittente"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Rispondi _a/mailing _list"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Spos_ta..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Copia..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Seg_na"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/Seg_na/Segn_a"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/Seg_na/To_gli segno"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/Seg_na/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Seg_na/Segna co_me non letto"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Seg_na/Segna come _letto"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/Seg_na/Segna il _thread come letto"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/Seg_na/Segna come tutti l_etti"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Colore etic_hetta"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Imposta come mail _spazzatura"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Imposta come mail non spa_zzatura"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Rim_odifica"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Aggiungi mittente alla ru_brica..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Crea re_gola per il filtro"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Crea re_gola per il filtro/A_utomaticamente"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Crea re_gola per il filtro/con _Da"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crea re_gola per il filtro/con _A"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crea re_gola per il filtro/con l'_Oggetto"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Creazione della vista del sommario...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Segno del processo"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Ricerca ancora"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Non esistono più messaggi non letti"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Non esistono più messaggi nuovi"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Non è stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Non esistono più messaggi segnati"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Non esistono più messaggi etichettati"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Selezione della cartella"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Selezione della cartella"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
diff --git a/po/ja.po b/po/ja.po
index 0c011bfe..8964aad5 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: 2010-07-21 14:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -318,7 +318,7 @@ msgstr ""
 "ファイル `%s' がすでに存在します。\n"
 "フォルダを作成できません。"
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -503,11 +503,11 @@ msgstr "%s が見つかりました\n"
 msgid "Configuration is saved.\n"
 msgstr "設定を保存しました。\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "迷惑メールフィルタ (手動)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "迷惑メールフィルタ"
 
@@ -652,7 +652,7 @@ msgstr ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -688,7 +688,7 @@ msgstr ""
 "新着メッセージはこの順番でチェックされます。「全受信」によるメッセージ\n"
 "の取得を有効にするには、「G」カラムのボックスをチェックしてください。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -829,7 +829,7 @@ msgstr "アドレスをアドレス帳に追加"
 msgid "Address"
 msgstr "アドレス"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
 #: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "備考"
@@ -838,32 +838,32 @@ msgstr "備考"
 msgid "Select Address Book Folder"
 msgstr "アドレス帳フォルダを選択"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "自動登録アドレス"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/ファイル(_F)"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/ファイル(_F)/新規アドレス帳(_B)"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/ファイル(_F)/新規_vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/ファイル(_F)/新規_JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -871,190 +871,190 @@ msgstr "/ファイル(_F)/新規LDAPサーバ(_L)"
 msgid "/_File/---"
 msgstr "/ファイル(_F)/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/ファイル(_F)/編集(_E)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/ファイル(_F)/削除(_D)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/ファイル(_F)/保存(_S)"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/ファイル(_F)/閉じる(_C)"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編集(_E)/コピー(_C)"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/編集(_E)/ペースト(_P)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/アドレス(_A)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/アドレス(_A)/新規アドレス(_A)"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/アドレス(_A)/新規グループ(_G)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/アドレス(_A)/新規フォルダ(_F)"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/アドレス(_A)/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/アドレス(_A)/編集(_E)"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/アドレス(_A)/削除(_D)"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/ツール(_T)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/ツール(_T)/_LDIFファイルをインポート"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/ツール(_T)/_CSVファイルをインポート"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/ヘルプ(_H)"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/ヘルプ(_H)/このプログラムについて(_A)"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/新規アドレス(_A)"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/新規グループ(_G)"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/コピー(_C)"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/ペースト(_P)"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "アドレス帳"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "フォルダ"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "検索:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:197
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:199
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
 #: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
 #: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "削除"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "追加"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "検索"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "閉じる(_C)"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "アドレスの削除"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "本当にこのアドレスを削除しますか?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1063,36 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "フォルダのみ(_F)"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "フォルダとアドレス(_A)"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "本当に `%s' を削除しますか?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "新規ユーザ、インデックスファイルを保存できません。"
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "新規ユーザ、アドレス帳ファイルを保存できません。"
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "旧形式のアドレス帳は正しく変換されました。"
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1100,7 @@ msgstr ""
 "旧形式のアドレス帳は変換されました。\n"
 "新規アドレスインデックスファイルに保存できません"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1108,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "しかし空の新規アドレス帳ファイルが作成されました。"
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1116,7 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1124,15 @@ msgstr ""
 "アドレス帳を変換できません。\n"
 "新規アドレス帳ファイルを作成できません。"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "アドレス帳の変換エラー"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "アドレス帳の変換"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,76 +1143,76 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "アドレス帳のエラー"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "旧形式のアドレス帳は変換されましたが、新規アドレスインデックスファイルを保存"
 "できません"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "アドレス帳を変換できませんでしたが、空の新規アドレス帳ファイルが作成されまし"
 "た。"
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "アドレス帳を変換できません。新規アドレス帳ファイルを作成できませんでした。"
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "アドレスインデックスを読み込めません"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "アドレス帳変換エラー"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "アドレス帳変換"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "インタフェース"
 
-#: src/addressbook.c:3720 src/importcsv.c:676 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "アドレス帳"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "人物"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "電子メール アドレス"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "グループ"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAPサーバ"
 
@@ -1224,11 +1224,11 @@ msgstr "共有アドレス"
 msgid "Personal address"
 msgstr "個人用アドレス"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "警告"
 
@@ -1275,7 +1275,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "なし"
 
@@ -1291,8 +1291,8 @@ msgstr "/追加(_A)..."
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
@@ -1366,7 +1366,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/表示(_V)"
 
@@ -1615,7 +1615,7 @@ msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
@@ -1806,7 +1806,7 @@ msgstr "MIME タイプ"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "サイズ"
 
@@ -2068,12 +2068,12 @@ msgstr "フォルダの編集"
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -2273,193 +2273,198 @@ msgstr "ファイルがすでに存在します。上書きしますか?"
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "受信箱"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "送信控"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "送信待ち"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "迷惑メール"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/新規フォルダを作成(_N)..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/フォルダ名を変更(_R)..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/フォルダを移動(_M)..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/フォルダを削除(_D)"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+msgid "/Empty _junk"
+msgstr "/迷惑メールを空にする(_J)"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/ごみ箱を空にする(_T)"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/新着メッセージをチェック(_C)"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/フォルダツリーを再構築(_E)"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/サマリを更新(_U)"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/すべて読んだことにする(_K)"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/送信待機中のメッセージを送信(_Q)"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/メッセージを検索(_S)..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/検索条件を編集(_I)..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/ダウンロード(_L)"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/ニュースグループを購読(_B)..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/ニュースグループを削除(_R)"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "フォルダビューを作成中...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "新着"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "未読"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "総数"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "フォルダ情報を設定中...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "フォルダツリーの再構築"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "フォルダツリーを再構築します。続けますか?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "フォルダツリーを再構築中..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "フォルダツリーの再構築に失敗しました。"
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "迷惑メール"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "'%s' 以下のすべてのメッセージをダウンロードしますか?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "すべてのメッセージをダウンロード"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2469,26 +2474,26 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "フォルダ '%s' の名前を変更できません。"
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "フォルダ `%s' を移動できません。"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2497,11 +2502,11 @@ msgstr ""
 "検索フォルダ '%s' を削除しますか?\n"
 "実際のメッセージは削除されません。"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "検索フォルダの削除"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2514,20 +2519,28 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "フォルダ '%s' を削除できません。"
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+msgid "Empty junk"
+msgstr "迷惑メールを空にする"
+
+#: src/folderview.c:2751
+msgid "Delete all messages in the junk folder?"
+msgstr "迷惑メールフォルダの中のメッセージをすべて削除しますか?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2536,34 +2549,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -2576,7 +2589,7 @@ msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(差出人不明)"
 
@@ -2930,7 +2943,7 @@ msgstr "切断中"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "メッセージを受信中 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3025,16 +3038,16 @@ msgstr "パスワードの入力"
 msgid "Protocol log"
 msgstr "プロトコルログ"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "使用法: %s [オプション]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    メッセージ作成ウィンドウを開く"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3044,23 +3057,23 @@ msgstr ""
 "                         指定したファイルを添付してメッセージ作成\n"
 "                         ウィンドウを開く"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              新着メッセージを受信する"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          全アカウントの新着メッセージを受信する"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送信待機中のメッセージをすべて送信する"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   メッセージの総数を表示する"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3068,45 +3081,45 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         各フォルダの状態を表示する"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum 新しいウィンドウでメッセージを開く"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir dirname    設定ファイルを格納するディレクトリを指定する"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      IPC リモートコマンド用のポートを指定する"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 Sylpheed を終了する"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                デバッグモード"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 このヘルプを表示して終了する"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              バージョン情報を出力して終了する"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "何かキーを押してください..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "ファイル名エンコーディング"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3129,19 +3142,19 @@ msgstr ""
 "\n"
 "続行しますか?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "作成中のメッセージが存在します。本当に終了しますか?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "送信待機中のメッセージ"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "送信待機中の未送信メッセージがあります。終了しますか?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3149,20 +3162,20 @@ msgstr ""
 "GnuPG が正しくインストールされていないか、バージョンが古すぎます。\n"
 "OpenPGP サポートは無効です。"
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "プラグインをロード中..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "別の Sylpheed がすでに起動しています。\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "設定の移行"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3506,15 +3519,15 @@ msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/表示(_V)/メッセージのソース(_A)"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/表示(_V)/すべてのヘッダ(_H)"
 
@@ -3810,8 +3823,8 @@ msgstr "メインウィンドウを作成中...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "完了。\n"
 
@@ -3878,7 +3891,7 @@ msgstr "Sylpheed - フォルダビュー"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
@@ -3894,15 +3907,15 @@ msgstr "/差出人に返信(_S)"
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
@@ -3946,19 +3959,19 @@ msgstr "このプログラムを終了しますか?"
 msgid "The selected messages could not be combined."
 msgstr "選択したメッセージを結合できませんでした。"
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "開くフォルダを選択してください"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "コマンドラインオプション"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "使用法: sylpheed [オプション]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3988,7 +4001,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4018,15 +4031,15 @@ msgstr ""
 "このヘルプを表示して終了する\n"
 "バージョン情報を出力して終了する"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr "Windows 専用オプション:"
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr "--ipcport portnum"
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr "IPC リモートコマンド用のポートを指定する"
 
@@ -4083,7 +4096,7 @@ msgstr "添付"
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
@@ -4104,7 +4117,7 @@ msgstr "/名前を付けて保存(_S)..."
 msgid "/Save _all..."
 msgstr "/すべて保存(_A)..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/印刷(_P)..."
 
@@ -4493,7 +4506,7 @@ msgstr "直接入力"
 msgid "Command output"
 msgstr "コマンドの出力"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "以下のアドレスを自動指定"
 
@@ -6095,28 +6108,28 @@ msgstr "タイプ"
 msgid "Normal"
 msgstr "通常"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "サマリで件名の先頭の[...]または(...)の部分を表示しない"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "返信時に件名の先頭の[...]または(...)の部分を削除する"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "アカウント"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "サブフォルダにも適用する"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "返信時にも使用"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:203
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -6152,19 +6165,19 @@ msgstr "添付"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "日付"
 
@@ -6174,7 +6187,7 @@ msgid "Number"
 msgstr "番号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "宛先"
 
@@ -6480,7 +6493,7 @@ msgstr "%s を検索中 (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "%s を検索中..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(日付なし)"
 
@@ -6577,7 +6590,7 @@ msgstr "このプログラムについて(_A)"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 リモートメールボックス"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "番号"
 
@@ -7134,7 +7147,7 @@ msgstr "ニュースグループリストを取得中..."
 msgid "Can't retrieve newsgroup list."
 msgstr "ニュースグループリストを取得できません。"
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "完了."
 
@@ -7143,340 +7156,340 @@ msgstr "完了."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d ニュースグループを受信 (%s 受信)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/返信の宛先(_Y)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/移動(_O)..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/コピー(_C)..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/マーク(_M)"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 msgid "/_Mark/Set _flag"
 msgstr "/マーク(_M)/フラグを付ける(_F)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 msgid "/_Mark/_Unset flag"
 msgstr "/マーク(_M)/フラグを外す(_U)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/マーク(_M)/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/マーク(_M)/未読としてマーク(_E)"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/マーク(_M)/読んだことにする(_D)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/マーク(_M)/スレッドを読んだことにする(_T)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/カラーラベル(_B)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/迷惑メールに指定(_J)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/迷惑メールではない(_U)"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/再編集(_E)"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/差出人をアドレス帳に追加(_K)..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/振り分けルールを作成(_I)"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/振り分けルールを作成(_I)/自動(_A)"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/振り分けルールを作成(_I)/_Fromから"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/振り分けルールを作成(_I)/_Toから"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/振り分けルールを作成(_I)/_Subjectから"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "サマリビューを作成中...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "フォルダをスキャン中 (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "マークの処理"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "マークが残っています。処理しますか?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 msgid "Could not establish a connection to the server."
 msgstr "サーバに接続できませんでした。"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "再検索(_S)"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "未読メッセージなし"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "未読メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "未読メッセージがありません。"
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 msgid "No unread message found. Go to next unread folder?"
 msgstr "未読メッセージがありません。次の未読フォルダに移動しますか?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "新着メッセージなし"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "新着メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "新着メッセージがありません。"
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "新着メッセージがありません。次の新着メッセージありフォルダに移動しますか?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "マーク付きメッセージなし"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "マーク付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "マーク付きメッセージがありません。"
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "マーク付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "ラベル付きメッセージなし"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "ラベル付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "ラベル付きメッセージがありません。"
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "ラベル付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "メッセージを件名でまとめています..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d 通削除"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 通移動"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 通コピー"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " 通選択"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通 (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "サマリをソート中..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tメッセージデータからサマリを作成中..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを作成中..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "移動先のフォルダを選択してください"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "コピー先のフォルダを選択してください"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
diff --git a/po/ko.po b/po/ko.po
index 1906acd5..d8bb0a60 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -326,7 +326,7 @@ msgstr ""
 "파일 `%s'가 이미 존재합니다.\n"
 "폴더를 생성할 수가 없습니다."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -508,12 +508,12 @@ msgstr "%s을 발견\n"
 msgid "Configuration is saved.\n"
 msgstr "설정이 저장되었습니다.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "폴더"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "폴더"
@@ -647,7 +647,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -685,7 +685,7 @@ msgstr ""
 "새 메시지는 이 순서대로 확인될 것입니다. `모두 받기'로 메시지를\n"
 "받으려면 `G' 컬럼 상자를 선택하세요."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -826,8 +826,8 @@ msgstr "주소록에 추가"
 msgid "Address"
 msgstr "주소"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "메모"
 
@@ -835,34 +835,34 @@ msgstr "메모"
 msgid "Select Address Book Folder"
 msgstr "주소록 폴더 선택"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "등록된 규칙"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/파일(_F)"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/파일(_F)/새 주소록(_B)"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/파일(_F)/새 vCard(_v)"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/파일(_F)/새 JPilot(_J)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/파일(_F)/새 서버(_S)"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -870,196 +870,196 @@ msgstr "/파일(_F)/새 서버(_S)"
 msgid "/_File/---"
 msgstr "/파일(_F)/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/파일(_F)/편집(_E)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/파일(_F)/삭제(_D)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/파일(_F)/저장(_S)"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/파일(_F)/닫기(_C)"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/편집(_E)/복사(_C)"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/주소(_A)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/주소(_A)/새 주소(_A)"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/주소(_A)/새 그룹(_G)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/주소(_A)/새 폴더(_F)"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/주소(_A)/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/주소(_A)/편집(_E)"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/주소(_A)/삭제(_D)"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/도구(_T)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/도구(_T)/LDIF 파일 가져오기(_L)"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/도움말(_H)"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/도움말(_H)/sylpheed 정보(_A)"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/새 주소(_A)"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/새 그룹(_G)"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/복사(_C)..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/편집(_E)/붙여넣기(_P)"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "주소록"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "폴더"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "찾기"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "삭제"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "추가"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "찾기"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "닫기"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "주소를 삭제"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "정말로 주소를 삭제하시겠습니까?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1068,38 +1068,38 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "폴더만"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "폴더와 주소"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "정말로 `%s'를 지우시겠습니까?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "새 사용자, 색인 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "새 사용자, 주소록 파일을 저장할 수 없습니다."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "예전 주소록을 성공적으로 변환하였습니다."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1107,7 @@ msgstr ""
 "예전 주소록이 변환되었습니다,\n"
 "새 주소록의 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "주소록을 변환할 수 없습니다,\n"
 "대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1123,7 @@ msgstr ""
 "주소록을 변환하지 못했습니다,\n"
 "새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,17 +1131,17 @@ msgstr ""
 "주소록을 변환하지 못했고\n"
 "새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1149,74 +1149,74 @@ msgid ""
 "%s%c%s"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "주소록 에러"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr "예전 주소록이 변환되었습니다, 새 주소록 색인 파일을 저장할 수 없습니다"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "주소록을 변환할 수 없습니다, 대신에 빈 새 주소록 파일을 생성하였습니다."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "주소록을 변환하지 못했습니다, 새 주소록 파일을 생성하지 못했습니다."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "주소록을 변환하지 못했고 새 주소록 파일도 생성하지 못했습니다."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "주소 색인을 읽을 수 없습니다"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "주소록 변환 에러"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "주소록 변환"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "인터페이스"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "주소록"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "사람"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "이메일 주소"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "그룹"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP 서버"
 
@@ -1228,11 +1228,11 @@ msgstr "공용 주소록"
 msgid "Personal address"
 msgstr "개인 주소록"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "알림"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "경고"
 
@@ -1279,7 +1279,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "없음"
 
@@ -1295,8 +1295,8 @@ msgstr "/추가(_A)..."
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
@@ -1377,7 +1377,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/보기(_V)"
 
@@ -1661,7 +1661,7 @@ msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -1705,7 +1705,7 @@ msgstr "다음 주소를 자동적으로 정함"
 msgid "From:"
 msgstr "보낸 사람:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "제목:"
 
@@ -1852,7 +1852,7 @@ msgstr "마임 타입"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "크기"
 
@@ -1985,28 +1985,28 @@ msgstr "이름과 값이 지정되지 않았습니다."
 msgid "Edit Person Data"
 msgstr "인물 자료 편집"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "표시 명"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "마지막 이름"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "처음 이름"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "가명"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "이메일 주소"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "별명"
 
@@ -2120,12 +2120,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2142,7 +2142,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot 항목 편집"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2335,201 +2335,207 @@ msgstr ""
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/새 폴더 만들기(_n)..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/폴더 지우기(_D)"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "지운 편지함 비우기"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/메시지 찾기(_S)..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/뉴스그룹 구독(_b)..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/뉴스그룹 삭제(_R)"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "폴더 뷰를 생성합니다...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "새것"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "안읽음"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "폴더 정보를 설정합니다...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "폴더 트리 갱신"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2539,26 +2545,26 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2567,12 +2573,12 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2583,21 +2589,31 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "제목"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2606,34 +2622,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2646,7 +2662,7 @@ msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(???)"
 
@@ -2726,120 +2742,120 @@ msgstr "불러올 파일을 선택"
 msgid "Select importing file"
 msgstr "불러올 파일을 선택"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "가져올 주소록 이름과 파일을 지정하세요."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "가져올 LDIF 항목을 선택하고 바꾸세요."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "파일을 가져왔습니다."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "파일을 선택하세요."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "주소록 이름이 지정되지않았습니다."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "LDIF field를 읽다가 에러가 발생했습니다."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF 파일을 성공적으로 가져왔습니다."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "vCard 파일 선택"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "파일 이름"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF Field"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "주소록 :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "위로"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "아래로"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "주소록 :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "파일 이름 :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr ""
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "LDIF 파일을 주소록으로 가져오기"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "다음"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "이전"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "파일 정보"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF Field"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr ""
 
@@ -3019,7 +3035,7 @@ msgstr "끝마치는 중"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "메시지 (%d / %d) 를 가져오는 중 (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3108,16 +3124,16 @@ msgstr "암호 입력"
 msgid "Protocol log"
 msgstr "프로토콜 로그"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [주소]       편집 창을 엽니다"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3127,71 +3143,71 @@ msgstr ""
 "                         지정된 파일을 첨부해서 편지 작성 창\n"
 "                         attached"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              새 메시지를 받습니다"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          모든 계정에서 새 메시지를 받습니다"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 큐에 있는 모든 메시지를 보냅니다"
 
-#: src/main.c:582
+#: src/main.c:585
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:583
+#: src/main.c:586
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               총 메시지 갯수를 알려줍니다"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                디버깅 모드"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 이 도움말을 표시하고 끝마침니다"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              버번 정보 출력하고 종료"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "보내는 메일의 문자셋"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3205,19 +3221,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "메시지를 편집하는 창이 있습니다. 정말 끝내시겠습니까?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr ""
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "보내지지 않은 메시지가 큐에 있습니다. 지금 종료할까요?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3225,21 +3241,21 @@ msgstr ""
 "GnuPG가 적절하게 인스톨되지 않았거나 너무 오래된 버전입니다.\n"
 "OpenPGP 지원기능을 끕니다."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "다른 Sylpheed가 이미 실행되고 있습니다.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "동작 설정을 씁니다...\n"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3609,15 +3625,15 @@ msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/보기(_V)/메시지 소스(_a)"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/보기(_V)/모든 헤더(_h)"
@@ -3935,8 +3951,8 @@ msgstr "새 창을 만듭니다...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -4007,7 +4023,7 @@ msgstr "Sylpheed - 폴더 보기"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
@@ -4026,15 +4042,15 @@ msgstr "/회신(_y)/보낸이(_s)"
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
@@ -4081,22 +4097,22 @@ msgstr "이 프로그램을 끝내시겠습니까?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "폴더 선택"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "명령이 지정되지않음"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "사용법: %s [옵션]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4113,7 +4129,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4130,15 +4146,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4195,7 +4211,7 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
@@ -4217,7 +4233,7 @@ msgstr "/새 이름으로(_S)..."
 msgid "/Save _all..."
 msgstr "/새 이름으로(_S)..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/인쇄(_)..."
 
@@ -4628,7 +4644,7 @@ msgstr ""
 msgid "Command output"
 msgstr "명령어"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "다음 주소를 자동적으로 정함"
 
@@ -4865,7 +4881,7 @@ msgstr ""
 msgid "Registered actions"
 msgstr "등록된 동작"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(새 규칙)"
 
@@ -6290,28 +6306,28 @@ msgstr "형식"
 msgid "Normal"
 msgstr "보통"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "계정"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "하위 폴더에 적용"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "회신시에도 사용"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "회신주소:"
 
@@ -6350,19 +6366,19 @@ msgstr "첨부"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "날짜"
 
@@ -6372,7 +6388,7 @@ msgid "Number"
 msgstr "숫자"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "받는 사람:"
@@ -6391,43 +6407,61 @@ msgid ""
 "the order by using the Up / Down button."
 msgstr ""
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "템플릿 이름"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "등록"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " 치환"
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " 심볼 "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "등록된 템플릿"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "템플릿"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "템플릿 이름"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "템플릿 이름"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "템플릿"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "템플릿 형식 에러."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "템플릿을 지웁니다"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "정말로 이 템플릿을 삭제하시겠습니까?"
 
@@ -6672,7 +6706,7 @@ msgstr "필터링..."
 msgid "Searching %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
@@ -6780,7 +6814,7 @@ msgstr "이 프로그램은"
 msgid "%s - POP3 Remote mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "번호"
 
@@ -7345,7 +7379,7 @@ msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 msgid "Can't retrieve newsgroup list."
 msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "완료."
 
@@ -7354,353 +7388,353 @@ msgstr "완료."
 msgid "%d newsgroups received (%s read)"
 msgstr ""
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/회신(_y)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/회신(_y)/전체(_a)"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "이동(_o)..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/복사(_C)..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/표시(_M)"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/표시(_M)/표시(_U)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/표시(_M)/표시 없앰(_U)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/표시(_M)/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/색 라벨(_b)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "기본 계정으로 설정"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/다시 편집(_e)"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/필터 규칙 생성(_i)"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/필터 규칙 생성(_i)/자동(_A)"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/필터 규칙 생성(_i)/보낸이로(_F)"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/필터 규칙 생성(_i)/받는이로(_T)"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/필터 규칙 생성(_i)/제목으로(_S)"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "요약 창을 생성합니다...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "폴더(%s)를 스캔..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "표시 처리"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "표시가 여전히 남아있습니다. 그것들을 처리할까요?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "폴더(%s)를 스캔..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "다시 찾기"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "안 읽은 메시지가 없슴 "
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "안 읽은 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "안 읽은 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "새 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "새 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "표시된 메시지가 없습니다"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "표시된 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "표시된 메시지가 없습니다."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "표시된 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "꼬리표있는 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "꼬리표있는 메시지가 없습니다."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "꼬리표있는 메시지가 없습니다. 처음부터 찾을까요?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d개 삭제됨"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d개 이동"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " 아이템 선택"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지(%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "폴더 선택"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "폴더 선택"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
diff --git a/po/lt.po b/po/lt.po
index d801baea..8dcdc2ae 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -319,7 +319,7 @@ msgstr ""
 "Failas „%s“ jau egzistuoja.\n"
 "Negaliu sukurti katalogo."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -504,11 +504,11 @@ msgstr "Rasta %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nustatymai išsaugoti.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Nepageidautino pašto filtras (neautomatinis)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Nepageidautino pašto filtras"
 
@@ -652,7 +652,7 @@ msgstr ""
 "adresu „Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA“."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -690,7 +690,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -831,8 +831,8 @@ msgstr "Įdėti adresą į knygą"
 msgid "Address"
 msgstr "Adresai"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Pastabos"
 
@@ -840,33 +840,33 @@ msgstr "Pastabos"
 msgid "Select Address Book Folder"
 msgstr "Pažymėkite adresų knygos katalogą"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registruoti šablonai"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Failas"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Failas/Nauja _Knyga"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Failas/Nauja „_vCard“ kortelė"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Failas/Naujas _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Failas/Naujas _LDAP serveris"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -874,190 +874,190 @@ msgstr "/_Failas/Naujas _LDAP serveris"
 msgid "/_File/---"
 msgstr "/_Failas/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Failas/_Taisa"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Failas/Išt_rinti"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Failas/Iš_saugoti"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Failas/_Užverti"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Taisa"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Taisa/Kopi_juoti"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Taisa/Į_dėti"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresas"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresas/Naujas _adresas"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresas/Nauja _grupė"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresas/Naujas _katalogas"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresas/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresas/_Redaguoti"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresas/Išt_rinti"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Į_rankiai"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Į_rankiai/Importuoti _LDIF failą"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/Į_rankiai/Importuoti _CSV failą"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pagalba"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pagalba/_Apie"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Naujas _adresas"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nauja _grupė"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Kopijuoti"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/Į_dėti"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresų knyga"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalogas"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Ieškoti:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Pridėti"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "Uždaryti"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Pašalinti adresą(-us)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Ar tikrai pašalinti adresą(-us)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1066,36 +1066,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Tik _katalogą"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Katalogą ir _adresus jame"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Tikrai pašalinti „%s“?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Naujas vartotojas, negaliu išsaugoti „index“ failo."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Naujas vartotojas, negaliu išsaugoti adresų knygos failų."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Adresų knyga sėkmingai konvertuota"
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1103,7 +1103,7 @@ msgstr ""
 "Sena adresų knyga konvertuota,\n"
 "negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1111,7 +1111,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "bet sukūriau tuščius naujos knygos failus."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1119,7 +1119,7 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1127,15 +1127,15 @@ msgstr ""
 "Negaliu konvertuoti adresų knygos,\n"
 "ir negaliu sukurti naujos knygos failų."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1143,74 +1143,74 @@ msgid ""
 "%s%c%s"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Adresų knygos klaida"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr "Sena knyga konvertuota, negaliu išsaugoti naujo adresų indekso failo"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, bet sukūriau naujus tuščius adresų knygos "
 "failus."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos, negaliu sukurti naujų adresų knygos failų."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Negaliu konvertuoti adresų knygos ir sukurti naujų adresų knygos failų."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Negaliu perskaityti adresų indekso"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Adresų knygos konvertavimo klaida"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Adresų knygos konvertavimas"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Sąsaja"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresų knyga"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Asmuo"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "El. pašto adresas"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupė"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP serveris"
 
@@ -1222,11 +1222,11 @@ msgstr "Bendras adresas"
 msgid "Personal address"
 msgstr "Asmeninis adresas"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Pranešimas"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Įspėjimas"
 
@@ -1273,7 +1273,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Nieko"
 
@@ -1289,8 +1289,8 @@ msgstr "/Pri_dėti..."
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
@@ -1364,7 +1364,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisa/_Automatiškai laužyti"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/Ro_dymas"
 
@@ -1613,7 +1613,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
@@ -1656,7 +1656,7 @@ msgstr "Automatiškai nustatyti šiuos adresus"
 msgid "From:"
 msgstr "Nuo:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -1805,7 +1805,7 @@ msgstr "MIME tipas"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Dydis"
 
@@ -1934,28 +1934,28 @@ msgstr "Pavadinimas ir reikšmė turi būti nurodyti."
 msgid "Edit Person Data"
 msgstr "Redaguoti asmens duomenis"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Rodomas vardas"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Pavardė"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Vardas"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Slapyvardis"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "El. pašto adresas"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Kitaip"
 
@@ -2067,12 +2067,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2089,7 +2089,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redaguoti JPilot įrašą"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2281,194 +2281,200 @@ msgstr ""
 msgid "Select folder"
 msgstr "Pasirinkti katalogą"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gauti"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Išsiųsti"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Eilė"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Nepageidautinas"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NaujasKatalogas"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Sukurti _naują katalogą..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Pe_rvadinti katalogą..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/Per_kelti katalogą..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Iš_trinti katalogą"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Išvaly_ti šiukšlinę"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Išvaly_ti šiukšlinę"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Patikrinti paštą"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/P_erkurti katalogų medį"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Atna_ujinti santrauką"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Pažymėti visus s_kaitytais"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "_Siųsti laiškus eilėje"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/I_eškoti laiškų"
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Ke_isti paieškos kriterijus..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/_Atsisiųsti"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Prisijungti prie naujienų grupės"
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Paša_linti naujienų grupę"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Sukuriama katalogų peržiūra...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nauji"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Neskaityti"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Nustatoma katalogo informacija...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Perkurti katalogų medį"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Bus perkurtas katalogų medis. Tęsti?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Perkuriamas katalogų medis..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Katalogų medžio perkūrimas nepavyko."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinami nauji laiškai visuose kataloguose..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Nepageidautinas"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Gaunami laiškai („%s“)..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Gauti visus laiškus kataloge „%s“?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Gauti visus laiškus"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida gaunant laiškus kataloge „%s“."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2478,26 +2484,26 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Negaliu pervadinti katalogo „%s“"
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2506,11 +2512,11 @@ msgstr ""
 "Ištrinti paieškos katalogą „%s“ ?\n"
 "Tikri laiškai nebus trinami."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Ištrinti paieškos katalogą"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2523,20 +2529,30 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Pageidautinas"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Ištrinti visus laiškus šiukšlinėje?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2545,34 +2561,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(laiškai NEBUS ištrinti iš disko)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -2585,7 +2601,7 @@ msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -2665,112 +2681,112 @@ msgstr "Pažymėkite importuojamą failą"
 msgid "Select importing file"
 msgstr "Pažymėkite importuojamą failą"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Nurodykite adresų knygą ir importuojamą failą."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Pasirinkite CSV laukų vardus importavimui."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Failas importuotas."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Pasirinkite failą."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Turi būti nurodytas adresų knygos pavadinimas."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Klaida skaitant CSV laukus."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "CSV failas importuotas sėkmingai."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Pasirinkite CSV failą"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Failo vardas"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "CSV Laukas"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Adresų knygos laukas"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Aukštyn"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Žemyn"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adresų knyga :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Failo vardas :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Įrašai :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importuoti CSV failą į adresų knygą"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Kitas"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Atgal"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Failo informacija"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Laukai"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Baigti"
 
@@ -2949,7 +2965,7 @@ msgstr "Išeinu"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Gaunamas laiškas (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3042,16 +3058,16 @@ msgstr "Įveskite slaptažodį"
 msgid "Protocol log"
 msgstr "Protokolo logas"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Naudojimas: %s [PARAMETRAI]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    atverti rašymo langą"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3061,23 +3077,23 @@ msgstr ""
 "                         atverti rašymo langą su prisegtais nurodytais\n"
 "                         failais"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              gauti naujus laiškus"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          gauti naujus laiškus iš visų sąskaitų"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 siųsti laiškus eilėje"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalogas]... rodyti bendrą laiškų skaičių"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3085,45 +3101,45 @@ msgstr ""
 "  --status-full [katalogas]...\n"
 "                         rodyti kiekvieno katalogo būseną"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir kelias     nurodyti konfigūracijos katalogą"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 uždaryti „Sylpheed“"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                derinimo rėžimas"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 rodyti šią pagalbą ir baigti"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              išvesti versiją ir baigti"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Spauskite bet kurį klavišą..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Failų vardų koduotė"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3147,19 +3163,19 @@ msgstr ""
 "\n"
 "Tęsti?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Rašomas laiškas. Tikrai išeiti?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Laiškai eilėje"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Eilėje yra neišsiųstų laiškų. Išeiti dabar?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3167,20 +3183,20 @@ msgstr ""
 "GnuPG nėra įdiegtas, arba jo versija per sena.\n"
 "OpenPGP palaikymas išjungtas."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed jau paleistas.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Konfigūracijos atnaujinimas"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3528,15 +3544,15 @@ msgstr "/Ro_dymas/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Ro_dymas/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/Ro_dymas/Atverti naujame _lange"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/Ro_dymas/Laiško pr_adinis tekstas"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/Ro_dymas/_Visos antraštės"
 
@@ -3837,8 +3853,8 @@ msgstr "Kuriamas pagrindinis langas..\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -3906,7 +3922,7 @@ msgstr "Sylpheed - Katalogų peržiūra"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Laiško peržiūra"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
@@ -3922,15 +3938,15 @@ msgstr "/Atsakyti _siuntėjui"
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
@@ -3974,20 +3990,20 @@ msgstr "Užverti programą?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Pasirinkti katalogą"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Komandinės eilutės parametrai"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Naudojimas: sylpheed [PARAMETRAI]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4017,7 +4033,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4047,15 +4063,15 @@ msgstr ""
 "rodyti pagalbos tekstą\n"
 "rodyti versiją"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4112,7 +4128,7 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti failo „%s“."
@@ -4133,7 +4149,7 @@ msgstr "/Iš_saugoti kaip..."
 msgid "/Save _all..."
 msgstr "/Išs_augoti viską..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/S_pausdinti..."
 
@@ -4527,7 +4543,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Komandos išvestis"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatiškai nustatyti šiuos adresus"
 
@@ -4779,7 +4795,7 @@ msgstr " Sintaksė "
 msgid "Registered actions"
 msgstr "Registruoti veiksmai"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Naujas)"
 
@@ -6137,28 +6153,28 @@ msgstr "Tipas"
 msgid "Normal"
 msgstr "Įprastas"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nerodyti [...] arba (...) temos pradžioje santraukoje"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Atsakant ištrinti [...] arba (...) temos pradžioje"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Sąskaita"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Pritaikyti ir pakatalogiams"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "naudoti ir atsakant"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Atsakyti kam:"
 
@@ -6194,19 +6210,19 @@ msgstr "Priedas"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Data"
 
@@ -6216,7 +6232,7 @@ msgid "Number"
 msgstr "Numeris"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Kam:"
@@ -6237,43 +6253,61 @@ msgstr ""
 "Pažymėkite laukus, rodomus santraukoje. Jūs galite keisti jų\n"
 "vietą mygtukais „Aukštyn“ / „Žemyn“."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Šablono pavadinimas"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registruoti"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Pakeisti "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Simboliai "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registruoti šablonai"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Šablonai"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Šablono pavadinimas"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Šablono pavadinimas"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Šablonas"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Šablono formato klaida."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Ištrinti šabloną"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Ar tikrai norite ištrinti šį šabloną?"
 
@@ -6510,7 +6544,7 @@ msgstr "Ieškoma %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Ieškoma „%s“..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Be datos)"
 
@@ -6613,7 +6647,7 @@ msgstr "Apie"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Nr."
 
@@ -7181,7 +7215,7 @@ msgstr "Gaunamas naujienų grupių sąrašas..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Negaliu gauti naujienų grupių sąrašo."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Atlikta."
 
@@ -7190,346 +7224,346 @@ msgstr "Atlikta."
 msgid "%d newsgroups received (%s read)"
 msgstr "Gauta naujienų grupių: %d (%s skaityta)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Atsak_yti"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Atsak_yti/_visiems"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Atsak_yti/_siuntėjui"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Atsak_yti/_konferencijai"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Per_kelti..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopijuoti..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Žy_ma"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/Žy_ma/Žy_mėti"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/Žy_ma/_Nežymėti"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/Žy_ma/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Žy_ma/Žymėti n_eskaityta"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Žy_ma/Žymėti skai_tyta"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/Žy_ma/Žymėti _giją skaityta"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/Žy_ma/Žymėti _visas skaitytomis"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Spa_lva"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Pažymėti kaip nepageidautiną"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Pažymėti kaip pageidautiną"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/R_edaguoti"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Pridėti siuntėją į adresų _knygą"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Sukurti filtravimo _taisyklę"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Sukuriamas santraukos vaizdas...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Skanuojamas katalogas (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Vykdyti žymą"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Palikta žymių. Vykdyti jas?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanuojamas katalogas (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Ieškoti dar kartą"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Daugiau nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nėra neskaitytų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nėra neskaitytų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Daugiau nėra naujų laiškų."
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Nėra naujų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Nėra naujų laiškų."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nėra naujų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Daugiau nėra pažymėtų laiškų"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Nėra pažymėtų laiškų."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Daugiau nėra laiškų su etiketėmis"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Nėra laiškų su etiketėmis."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Laiškai pritraukiami pagal temą..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d ištrinta"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d perkelta"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d nukopijuota"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " objektas(-ai) pažymėti"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nauji: %d, neskaityti: %d, viso: %d (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nauji: %d, neskaityti: %d, viso: %d"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tNustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Laiškas %d pažymėtas\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Laiškas %d pažymėtas kaip skaitytas\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Laiškas %d pažymėtas kaip neskaitytas\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Laiškas %s/%d pažymėtas trinimui\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti laiškus iš šiukšlinės?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Trinami identiški laiškai..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Laiškas %s/%d atžymėtas\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Laiškas %d pažymėtas perkėlimui į %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Pasirinkti katalogą"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Laiškas %d pažymėtas kopijavimui į %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Pasirinkti katalogą"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su laiškais."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota laiškų: %d"
diff --git a/po/nl.po b/po/nl.po
index 96761afe..2dd94ff9 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -322,7 +322,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -510,12 +510,12 @@ msgstr "%s gevonden\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuratie is opgeslagen.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Troepfilter"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Troepfilter"
 
@@ -661,7 +661,7 @@ msgstr ""
 "bij de Free Software Foundation Inc., 59 Temple Place - Suite 330, Boston, "
 "MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -700,7 +700,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -841,8 +841,8 @@ msgstr "Adres toevoegen aan adresboek"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Opmerkingen"
 
@@ -850,33 +850,33 @@ msgstr "Opmerkingen"
 msgid "Select Address Book Folder"
 msgstr "Selecteer adresboekmap"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Gebruikte sjablonen"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Bestand"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Bestand/Nieuw _adresboek"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Bestand/Nieuwe _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Bestand/Nieuwe _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Bestand/Nieuwe _LDAP-server"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -884,195 +884,195 @@ msgstr "/_Bestand/Nieuwe _LDAP-server"
 msgid "/_File/---"
 msgstr "/_Bestand/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Bestand/Aanpassen"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Bestand/_Verwijderen"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Bestand/_Opslaan"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Bestand/_Sluiten"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Be_werken/_Kopiëren"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Nieuw _adres"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Nieuwe _groep"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Nieuwe _map"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Bewerken"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Verwijderen"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Gereedschap"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Gereedschap/_LDIF bestand importeren"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hulp"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hulp/_Info"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nieuw _adres"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nieuwe _groep"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopieer..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Be_werken/_Plakken"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresboek"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Accounts"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Verwijderen"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Toevoegen"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Zoeken:"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Kleuren"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Adres(sen) verwijderen"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Wilt u de adressen werkelijk verwijderen?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,36 +1082,36 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Verwijder map"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Alleen _map"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Map en _adressen"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Wilt u '%s' werkelijk verwijderen?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nieuwe gebruiker: Kon indexbestand niet opslaan."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Nieuwe gebruiker: Kon adresboekbestanden niet opslaan."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Oude adresboekgegevens succesvol omgezet."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1119,7 +1119,7 @@ msgstr ""
 "Oude adresboekgegevens omgezet.\n"
 "Kon het nieuwe adresboek indexbestand niet opslaan."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1127,7 +1127,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Nieuw leeg adresboek is gemaakt."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1135,7 +1135,7 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon geen nieuwe adresboek bestanden aanmaken."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1143,17 +1143,17 @@ msgstr ""
 "Kon adresboekgegevens niet omzetten.\n"
 "Kon ook geen nieuwe adresboekbestanden aanmaken."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adresboek omzetting"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1161,79 +1161,79 @@ msgid ""
 "%s%c%s"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adresboekprobleem"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Kon adresboek index niet lezen"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adresboek omzetprobleem"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adresboek Omzetting"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresboek"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Persoon"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "E-mail adres"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Groep"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1245,11 +1245,11 @@ msgstr "Algemene adressen"
 msgid "Personal address"
 msgstr "Persoonlijke adressen"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Bericht"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Waarschuwing"
 
@@ -1296,7 +1296,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Geen"
 
@@ -1312,8 +1312,8 @@ msgstr "/_Toevoegen..."
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
@@ -1387,7 +1387,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Be_werken/Regel_terugloop"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/Beel_d"
 
@@ -1640,7 +1640,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -1683,7 +1683,7 @@ msgstr "Stel automatisch de volgende adressen in"
 msgid "From:"
 msgstr "Afzender:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Onderwerp:"
 
@@ -1832,7 +1832,7 @@ msgstr "MIME-type"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Grootte"
 
@@ -1962,28 +1962,28 @@ msgstr "Een naam en waarde moeten worden gegeven."
 msgid "Edit Person Data"
 msgstr "Persoonsgegevens bewerken"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Naam in de lijst"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Achternaam"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Voornaam"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Alias"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-mail adres"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2098,12 +2098,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2120,7 +2120,7 @@ msgid "Edit JPilot Entry"
 msgstr "Bewerk JPilot veld"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr "Bladeren..."
@@ -2314,196 +2314,202 @@ msgstr ""
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Troep"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/_Nieuwe map maken..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/Map ver_plaatsen..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Map ver_wijderen"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/_Prullenbak legen"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/_Prullenbak legen"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Samenvatting _verversen"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "Als gelezen markeren"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Berichten uit de wachtrij ver_zenden"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Berichten _doorzoeken..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Zoekopdracht be_werken..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Down_loaden"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/A_bonneren op een nieuwsgroep..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Nieuws_groep verwijderen"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "De mappenboom zal opnieuw opgebouwd worden. Doorgaan?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Opnieuw opbouwen van de mappenboom mislukt."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Troep"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het downloaden van berichten in '%s'."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2513,26 +2519,26 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan map '%s' niet hernoemen."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2541,11 +2547,11 @@ msgstr ""
 "Wilt u de zoekmap '%s' verwijderen?\n"
 "De berichten zelf zullen NIET worden verwijderd."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Zoekmap verwijderen"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2558,20 +2564,30 @@ msgstr ""
 "\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Geen troep"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Alle berichten uit de prullenbak weggooien?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2580,34 +2596,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2620,7 +2636,7 @@ msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -2700,121 +2716,121 @@ msgstr "Selecteer het te importeren bestand"
 msgid "Select importing file"
 msgstr "Selecteer het te importeren bestand"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr ""
 "Geef alstublieft de naam van het adresboek en het te importeren bestand."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Kies en hernoem LDIF veldnamen om te importeren."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Bestand geïmporteerd."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Selecteer een bestand."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "U moet wel een adresboek naam geven."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Fout bij lezen LDIF velden."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF bestand succesvol geïmporteerd."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Selecteer vCard bestand"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Bestandsnaam"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF Veld"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adresboek :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Omhoog"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Omlaag"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adresboek :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Bestandsnaam :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Kaarten :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Importeer LDIF bestand in het adresboek"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Volgende"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Vorig"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Bestandsinfo"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF Veld"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Afronden"
 
@@ -2994,7 +3010,7 @@ msgstr "Bezig met afsluiten"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Bericht wordt opgehaald (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3088,16 +3104,16 @@ msgstr "Geef wachtwoord"
 msgid "Protocol log"
 msgstr "Protocol-logboek"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Gebruik: %s [OPTIES]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      open venster \"Bericht opstellen\""
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3107,23 +3123,23 @@ msgstr ""
 "                         venster 'bericht opstellen' openen met de\n"
 "                         gespecificeerde bestanden als bijlagen"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              haal nieuwe berichten op"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          Berichten ophalen van alle accounts"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 verstuur alle berichten uit de wachtrij"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [map]...      totaal aantal berichten weergeven"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3131,47 +3147,47 @@ msgstr ""
 "  --status-full [map]...\n"
 "                         status van iedere map weergeven"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir mapnaam    de map waar de configuratiebestanden zich in "
 "bevinden"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 Sylpheed afsluiten"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug modus"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 geef deze hulp weer"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr " --version\t\tgeef versie informatie en sluit af"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Druk op een toets..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Bestandscodering"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3195,21 +3211,21 @@ msgstr ""
 "\n"
 "Toch doorgaan?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "U bent een bericht aan het opstellen.\n"
 "Wilt u werkelijk het programma afsluiten?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Berichten zijn in de wachtrij gezet"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Er staan nog berichten in de wachtrij. Toch afsluiten?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3217,20 +3233,20 @@ msgstr ""
 "GnuPG is niet goed geïnstalleerd of is te oud.\n"
 "OpenPGP ondersteuning wordt uitgeschakeld."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "er draait al een Sylpheed.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Configuratie omzetten"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3580,15 +3596,15 @@ msgstr "/Beel_d/_Tekstcodering/Chinees (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Beel_d/_Tekstcodering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/Beel_d/In _nieuw venster openen"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/Beel_d/_Broncode weergeven"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/Beel_d/Vo_lledige header"
@@ -3893,8 +3909,8 @@ msgstr "Hoofdvenster wordt aangemaakt...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -3963,7 +3979,7 @@ msgstr "Sylpheed - Mappenoverzicht"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
@@ -3979,15 +3995,15 @@ msgstr "/_Afzender beantwoorden"
 msgid "/Reply to mailing _list"
 msgstr "/_Discussielijst beantwoorden"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
@@ -4038,20 +4054,20 @@ msgstr "Sylpheed afsluiten?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Selecteer map"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Opties voor de opdrachtregel"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Gebruik: Sylpheed [OPTIES]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4081,7 +4097,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4111,15 +4127,15 @@ msgstr ""
 "dit bericht weergeven\n"
 "versieinformatie weergeven"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4176,7 +4192,7 @@ msgstr "Bijlagen"
 msgid "Message View - Sylpheed"
 msgstr "Nieuw bericht - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
@@ -4197,7 +4213,7 @@ msgstr "/Opslaan als..."
 msgid "/Save _all..."
 msgstr "/Alle_s opslaan..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Afdrukken..."
 
@@ -4595,7 +4611,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Resultaat van opdracht"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Stel automatisch de volgende adressen in"
 
@@ -4849,7 +4865,7 @@ msgstr " Syntaxhulp"
 msgid "Registered actions"
 msgstr "Ingestelde acties"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(nieuw)"
 
@@ -6225,31 +6241,31 @@ msgstr "Type"
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 "Geen [...] of (...) weergeven aan het begin van het onderwerp in de "
 "berichtenlijst"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 "[...] of (...) verwijderen aan het begin van het onderwerp bij beantwoorden"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Account"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Toepassen op submappen"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "ook gebruiken bij beantwoorden"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Antwoord-Aan:"
 
@@ -6285,19 +6301,19 @@ msgstr "Bijlage"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Datum"
 
@@ -6307,7 +6323,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Aan:"
@@ -6330,43 +6346,61 @@ msgstr ""
 "U kunt de volgorde veranderen door op de knoppen Omhoog en Omlaag\n"
 "te klikken, of door de items te slepen."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Sjabloonnaam:"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Toevoegen"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Vervangen"
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr "Beschrijving der symbolen"
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Gebruikte sjablonen"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Sjabloonbeheer"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Sjabloonnaam:"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Sjabloonnaam:"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Sjabloon"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Sjabloon opmaakfout."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Verwijder sjabloon"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Wil je dit sjabloon werkelijk verwijderen?"
 
@@ -6613,7 +6647,7 @@ msgstr "Doorzoeken van %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Doorzoeken van %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
@@ -6716,7 +6750,7 @@ msgstr "_Info"
 msgid "%s - POP3 Remote mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Nr."
 
@@ -7285,7 +7319,7 @@ msgstr "Lijst avn nieuwsgroepen wordt opgehaald..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan geen nieuwsgroep opvragen."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Klaar."
 
@@ -7294,349 +7328,349 @@ msgstr "Klaar."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d nieuwsgroepen ontvangen (%s ingelezen)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Ant_woord sturen aan"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Ant_woord sturen aan/_iedereen"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Ant_woord sturen aan/_discussielijst"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Verplaats..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopieer..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Markeren"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Markeren/_Markeren"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Markeren/D_emarkeren"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Markeren/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markeren/Als _ongelezen"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markeren/Als _gelezen"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Markeren/Als gelezen (dis_cussie)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markeren/_Alles als gelezen"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Kle_urlabel"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Dit is troep"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Dit is troep"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Be_werken"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Afz_ender toevoegen aan adresboek..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/F_ilterregel aanmaken"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/F_ilterregel aanmaken/_Automatisch"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/F_ilterregel aanmaken/op _Afzender"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/F_ilterregel aanmaken/op _Geadresseerde"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/F_ilterregel aanmaken/op _Onderwerp"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Venster Berichtenlijst wordt aangemaakt...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Verwerk markering"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Opnieuw zoeken"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Selecteer map"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Doel voor kopiëren is gelijk aan de huidige map."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Selecteer map"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de berichten."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Er zijn %d berichten gefilterd."
diff --git a/po/pl.po b/po/pl.po
index 3862f809..b1236f8e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.5.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2008-06-17 22:25+0100\n"
 "Last-Translator: Jan Stępień <jstepien@users.sourceforge.net>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -317,7 +317,7 @@ msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -496,11 +496,11 @@ msgstr "Znaleziono: %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracja zapisana.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Filtr niechcianej poczty (ręczny)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Filtr niechcianej poczty"
 
@@ -646,7 +646,7 @@ msgstr ""
 "Licencji Publicznej GNU (GNU General Public License);jeśli nie - napisz do "
 "Free Software Foundation, Inc., 675 Mass Ave,Cambridge, MA 02139, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -684,7 +684,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -825,8 +825,8 @@ msgstr "Dodaj do książki adresowej"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Uwagi"
 
@@ -834,33 +834,33 @@ msgstr "Uwagi"
 msgid "Select Address Book Folder"
 msgstr "Wybierz katalog książki adresowej"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Zarejestrowane szablony"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Plik"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Plik/Nowa _książka"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Plik/Nowy _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Plik/Nowy _J-Pilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Plik/Nowy serwer _LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -868,192 +868,192 @@ msgstr "/_Plik/Nowy serwer _LDAP"
 msgid "/_File/---"
 msgstr "/_Plik/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Plik/_Edycja"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Plik/_Usuń"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Plik/Zapi_sz"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Plik/_Zamknij"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Edycja/_Kopiuj"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Edycja/_Wstaw"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Plik/Nowy _adres"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Plik/Nowa _grupa"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Plik/Nowy _katalog"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adres/_Edycja"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Usuń"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Narzędzia"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Plik/Importuj plik _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Narzędzia/Importuj plik _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Pomo_c"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Pomo_c/_O programie"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nowy _adres"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nowa _grupa"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Usuń"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Kopiuj"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/_Wklej"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Książka adresowa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Katalog"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr " Szukaj "
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Usuń"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr " Szukaj "
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Zamknij"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Usuń adres(y)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Czy naprawdę chcesz usunąć ten adres(y)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1063,36 +1063,36 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "_Tylko katalog"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Katalog i _adresy"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Czy naprawdę usunąć \"%s\" ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nowy użytkownik, nie można było zapisać pliku indeksu."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 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:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Konwersja starej książki adresowej została zakończona pomyślnie."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1100,7 +1100,7 @@ msgstr ""
 "Stara książka adresowa została skonwertowana,\n"
 "nie można było zapisać nowego pliku indeksu adresów."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1108,7 +1108,7 @@ msgstr ""
 "Nie można było skonwertować książki adresowej,\n"
 "utworzono puste pliki nowej książki adresowej."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1116,7 +1116,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:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1124,15 +1124,15 @@ msgstr ""
 "Nie można było skonwertować książki adresowej\n"
 "oraz utworzyć nowych plików książki adresowej."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1140,78 +1140,78 @@ msgid ""
 "%s%c%s"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Błąd książki adresowej"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Nie można odczytać książki adresowej"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Błąd konwersji książki adresowej"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Konwersja książki adresowej"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interfejs"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Książka adresowa"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Adres e-mail"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Serwer LDAP"
 
@@ -1223,11 +1223,11 @@ msgstr "Wspólny adres:"
 msgid "Personal address"
 msgstr "Osobisty adres:"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Notatka"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
@@ -1274,7 +1274,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Brak"
 
@@ -1290,8 +1290,8 @@ msgstr "/Dod_aj..."
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
@@ -1365,7 +1365,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Widok"
 
@@ -1615,7 +1615,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
@@ -1656,7 +1656,7 @@ msgstr "Na pewno wysłać tę wiadomość do następujących odbiorców?"
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Temat:"
 
@@ -1805,7 +1805,7 @@ msgstr "typ MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -1935,28 +1935,28 @@ msgstr "Należy podać nazwę i wartość."
 msgid "Edit Person Data"
 msgstr "Edytuj dane osoby"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Wyświetlana nazwa"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Nazwisko"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Imię"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Pseudonim"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adres e-mail"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Zwany inaczej"
 
@@ -2068,12 +2068,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2090,7 +2090,7 @@ msgid "Edit JPilot Entry"
 msgstr "Edytuj wpis JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2282,194 +2282,200 @@ msgstr "Plik o tej nazwie już istnieje. Czy chcesz go zastąpić?"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Niechciane"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Utwórz _nowy katalog..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Zmień nazwę katalogu..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Przenieś katalog..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Usuń katalog"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Opróżnij śmie_tnik"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Opróżnij śmie_tnik"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Sprawdź nowe wiadomoś_ci"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Odbuduj drz_ewo katalogów"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/_Odśwież podsumowanie"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/_Oznacz jako przeczytane"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Wy_szukaj wiadomości..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Pobierz"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Subskrybuj grupę news..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Usuń g_rupę news"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Tworzenie widoku katalogów...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Razem"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalogów"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalogów zostnie przebudowane. Kontynuować?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalogów..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Błąd podczas odbudowywania drzewa katalogów."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Niechciane"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Pobrać wszystkie wiadomości z \"%s\"?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Pobierz wszystkie wiadomości"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2479,26 +2485,26 @@ msgstr ""
 "(jeśli ma zostać utworzony katalog w celu przechowywania\n"
 "innych wiadomości, należy dołączyć \"/\" na końcu nazwy)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nie można zmienić nazwy katalogu \"%s\"."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można przenieść katalogu \"%s\"."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2507,11 +2513,11 @@ msgstr ""
 "Czy na pewno usunąć folder wyszukiwania \"%s\" ?\n"
 "Wiadomości nie zostaną usunięte."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Usuń katalog wyszukiwania"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2524,20 +2530,30 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz je usunąć?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Niechciana"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2546,34 +2562,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -2586,7 +2602,7 @@ msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -2666,114 +2682,114 @@ msgstr "Wybierz importowany plik"
 msgid "Select importing file"
 msgstr "Wybierz importowany plik"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Określ nazwę książki adresowej i pliku do importu."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Wybierz i zmień kolejność pól CSV do importu."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Plik zaimportowano."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Wybierz plik."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Należy podać nazwę książki adresowej."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Błąd przy odczycie pól CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Plik CSV został pomyślnie zaimportowany."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Wybierz plik CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nazwa pliku"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Rozdzielone przecinkami"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Rozdzielone znakami tabulacji"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Pole CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Pole książki adresowej"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 #, fuzzy
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 "Zmień kolejność pól książki adresowej przy pomocy przycisków Góra i Dół."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "W górę"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "W dół"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Książka adresowa :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nazwa pliku :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Rekordy :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importuj plik CSV do książki adresowej"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Następna"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Poprzednia"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Informacja o pliku"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Pola"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Koniec"
 
@@ -2952,7 +2968,7 @@ msgstr "Wychodzenie"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Pobieranie wiadomości (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3048,16 +3064,16 @@ msgstr "Wprowadź hasło"
 msgid "Protocol log"
 msgstr "Dziennik protokołu"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]      otwiera okno tworzenia wiadomości"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3067,23 +3083,23 @@ msgstr ""
 "                         otwiera okno tworzenia wiadomości z plikami,\n"
 "                         które mają zostać dołączone"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              odbiera nowe wiadomości"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          odbiera nowe wiadomości dla wszystkich kont"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 wysyła wszystkie skolejkowane wiadomości"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [katalog]...    pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3091,47 +3107,47 @@ msgstr ""
 "  --status-full [katalog]...\n"
 "                         pokazuje łączną liczbę wiadomości"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum otwórz wiadomość w nowym oknie"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    podaj katalog, który zawiera pliki konfiguracyjne"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 zakończ Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                tryb debugowania"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 wyświetla tę pomoc i wychodzi"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version              wyświetla informację o wersji i kończy działanie"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Wciśnij dowolny klawisz..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Kodowanie nazwy pliku"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3145,19 +3161,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Tworzenie nowej wiadomości. Czy zakończyć?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Skolejkowane wiadomości"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Niektóre niewysłane wiadomości zostały skolejkowane. Czy wyjść?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3165,20 +3181,20 @@ msgstr ""
 "Program GnuPG nie jest poprawnie zainstalowany, lub jego\n"
 "wersja jest zbyt stara. Obsługa OpenPGP została wyłączona."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "Jest już uruchomiona kopia programu Sylpheed.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migracja ustawień"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3523,15 +3539,15 @@ msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Widok/P_okaż źródło"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Widok/Wszystkie na_główki"
 
@@ -3836,8 +3852,8 @@ msgstr "Tworzenie głównego okna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -3908,7 +3924,7 @@ msgstr "Sylpheed - Widok Katalogów"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
@@ -3924,15 +3940,15 @@ msgstr "/Odpowiedz nadawcy"
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
@@ -3979,22 +3995,22 @@ msgstr "Czy zakończyć program?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Wybierz katalog"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Nie ustawiono polecenia."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Użycie: %s [OPCJE]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4011,7 +4027,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4028,15 +4044,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4093,7 +4109,7 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr "Widok wiadomości - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
@@ -4115,7 +4131,7 @@ msgstr "/Zapi_sz jako..."
 msgid "/Save _all..."
 msgstr "/Zapi_sz jako..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Drukuj..."
 
@@ -4523,7 +4539,7 @@ msgstr "Bezpośrednio wprowadzony"
 msgid "Command output"
 msgstr "Wyjście polecenia"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatyczne ustawianie następujących adresów"
 
@@ -4780,7 +4796,7 @@ msgstr " Pomoc składni "
 msgid "Registered actions"
 msgstr "Zarejestrowane polecenia"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nowy)"
 
@@ -6187,28 +6203,28 @@ msgstr "Typ"
 msgid "Normal"
 msgstr "Zwykłe"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nie wyświetlaj [...] lub (...) na początku tematu przy podsumowaniu"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Usuń [...] lub (...) z początku tematu przy odpowiedzi"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Konto"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Stosowane także do podkatalogów"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "użycie także przy odpowiadaniu"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Adres zwrotny:"
 
@@ -6246,19 +6262,19 @@ msgstr "Załącznik"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Data"
 
@@ -6268,7 +6284,7 @@ msgid "Number"
 msgstr "Numer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Do:"
@@ -6290,43 +6306,61 @@ msgstr ""
 "Wybierz pozycje wyświetlane w widoku podsumowania.\n"
 "Można zmienić ich kolejność przyciskami Góra / Dół lub przeciągając elementy."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nazwa szablonu"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Rejestruj"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Zastąp "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Symbole "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Zarejestrowane szablony"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Szablony"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nazwa szablonu"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nazwa szablonu"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Szablon"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Błąd formatu szablonu."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Usuń szablon"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Czy naprawdę chcesz usunąć ten szablon?"
 
@@ -6575,7 +6609,7 @@ msgstr "Filtowanie..."
 msgid "Searching %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
@@ -6683,7 +6717,7 @@ msgstr "O programie"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Nr"
 
@@ -7259,7 +7293,7 @@ msgstr "Nie można pobrać listy grup dyskusyjnych."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie można pobrać listy grup dyskusyjnych."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Gotowe."
 
@@ -7268,372 +7302,372 @@ msgstr "Gotowe."
 msgid "%d newsgroups received (%s read)"
 msgstr "pobrano %d grup dyskusyjnych (%s przeczytano)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Odpowied_z"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Odpowied_z/wszystki_m"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Odpowied_z/nadawc_y"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odpowied_z/_liście dyskusyjnej"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Przenieś..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopiuj..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Zaznacz"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Zaznacz/_Zaznacz"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Zaznacz/_Odznacz"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Zaznacz/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Zaznacz/Zaznacz jako niep_rzeczytane"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Zaznacz/Zaznacz jako prz_eczytane"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Zaznacz/Zaznacz jako prz_eczytane"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Zaznacz/Zaznacz wszystkie jako prz_eczytane"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Kolor etykiety"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Ustaw jako domyślne"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Prz_eedytuj"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Tworzenie widoku podsumowania...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Znacznik procesu"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "brak niektórych znaczników, czy wykonać ?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Nie można ustanowić sesji IMAP4 z: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Nie ma więcej nieprzeczytanych wiadomości"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomości."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Nie ma więcej nowych wiadomości"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Brak nowych wiadomości"
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Nie ma więcej zaznaczonych wiadomości"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpoczać wyszukiwanie od końca?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomości"
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomości."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Łączenie wiadomości wg tematu..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " element(ów) wybrany(o)"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Wybierz katalog"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Wybierz katalog"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 7047cc76..77981692 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -16,7 +16,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-02-22 15:47-0300\n"
 "Last-Translator: Alexandre Erwin Ittner <alexandre@ittner.com.br>\n"
 "Language-Team: Portuguese/Brazil <(none)>\n"
@@ -328,7 +328,7 @@ msgstr ""
 "O arquivo \"%s\" já existe.\n"
 "Não foi possível criar a pasta."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -513,11 +513,11 @@ msgstr "Encontrado %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configuração salva.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Filtro de spam (manual)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Filtro de spam"
 
@@ -662,7 +662,7 @@ msgstr ""
 "programa; se não, escreva para a Free Software Foundation, Inc., 59 Temple "
 "Place, Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -698,7 +698,7 @@ msgstr ""
 "Mensagens novas serão baixadas nessa ordem. Marque as caixas\n"
 "na coluna \"G\" para habilitar essa caixa no comando \"Receber todas\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -839,8 +839,8 @@ msgstr "Adicionar ao Catálogo de Endereços"
 msgid "Address"
 msgstr "Endereço"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notas"
 
@@ -848,32 +848,32 @@ msgstr "Notas"
 msgid "Select Address Book Folder"
 msgstr "Selecione pasta do Catálogo de Endereços"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Endereços registrados automaticamente"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arquivo"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Arquivo/Novo _Catálogo de Endereços"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Arquivo/Novo _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Arquivo/Novo _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arquivo/Novo Servidor _LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -881,190 +881,190 @@ msgstr "/_Arquivo/Novo Servidor _LDAP"
 msgid "/_File/---"
 msgstr "/_Arquivo/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Arquivo/_Editar"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Arquivo/E_xcluir"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Arquivo/_Salvar"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arquivo/_Fechar"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editar/_Copiar"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editar/Co_lar"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Endereço"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Endereço/Nova _Entrada"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Endereço/Novo _Grupo"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Endereço/Nova _Pasta"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Endereço/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Endereço/E_ditar"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Endereço/E_xcluir"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Ferramentas"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Ferramentas/Importar arquivo _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Ferramentas/Importar arquivo _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/A_juda"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/A_juda/_Sobre"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Novo _Endereço"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Novo _Grupo"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/E_xcluir"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Copiar"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/Co_lar"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Catálogo de endereços"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Pasta"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Procurar:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Cco:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Excluir"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Adicionar"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Procurar"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "_Fechar"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Excluir endereço(s)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Você realmente deseja excluir o(s) endereço(s)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1074,37 +1074,37 @@ msgstr ""
 "Caso você exclua somente a pasta, os endereços serão movidos para a pasta "
 "pai."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Excluir pasta"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Apenas a_pasta"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Pasta e _endereços"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Você realmente deseja excluir \"%s\"?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Novo usuário, não foi possível salvar arquivo de índice."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr ""
 "Novo usuário, não foi possível salvar arquivos do catálogo de endereços."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Catálogo de endereços antigo convertido com sucesso."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1112,7 +1112,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:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1120,7 +1120,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:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1128,7 +1128,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:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1136,15 +1136,15 @@ 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:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Erro ao converter o catálogo de endereços"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Conversão do catálogo de endereços"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1155,78 +1155,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Erro no Catálogo de Endereços"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "O catálogo de endereços antigo foi convertido, mas não foi possível salvar o "
 "arquivo de índice do novo"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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 para o novo catálogo de endereços."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Não foi possível ler o índice do endereço"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Erro na conversão do catálogo de endereços"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Conversão do Catálogo de Endereços"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interface"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Catálogo de Endereços"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Pessoa"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Endereço de e-mail"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupo"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Servidor LDAP"
 
@@ -1238,11 +1238,11 @@ msgstr "Endereços comuns"
 msgid "Personal address"
 msgstr "Endereços pessoais"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Notificação"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Aviso"
 
@@ -1289,7 +1289,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1305,8 +1305,8 @@ msgstr "/_Adicionar"
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Propr_iedades..."
 
@@ -1380,7 +1380,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebrar linhas automaticamente"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/E_xibir"
 
@@ -1629,7 +1629,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) desta mensagem."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -1671,7 +1671,7 @@ msgstr ""
 msgid "From:"
 msgstr "De:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Assunto:"
 
@@ -1822,7 +1822,7 @@ msgstr "Tipo MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Tamanho"
 
@@ -1953,28 +1953,28 @@ msgstr "Um Nome e um Valor devem ser informados"
 msgid "Edit Person Data"
 msgstr "Editar dados pessoais"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Nome de exibição"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Último Nome"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Primeiro Nome"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Apelido"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Endereço de e-mail"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Apelido"
 
@@ -2086,12 +2086,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2108,7 +2108,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editar entrada JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2293,193 +2293,199 @@ msgstr "O arquivo já existe. Deseja substituí-lo?"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Caixa de entrada"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Mensagens enviadas"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Caixa de saída"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Spam"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" não pode ser usado no nome da pasta."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta \"%s\" já existe."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Não foi possível criar a pasta \"%s\"."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Mover pasta..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/E_xcluir pasta"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Esvaziar _lixeira"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Esvaziar _lixeira"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Buscar novas mensagens"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/A_tualizar sumário"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "Marcar todas como li_das"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "_Enviar mensagens pendentes"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Procurar mensagens..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Ed_itar a condição de busca..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/_Baixar"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Assinar grupo de notícias..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo de notícias"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Criando visualizador de pasta...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Não lido"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Total"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Configurando informações da pasta...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Atualizar árvore de pastas"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A árvore de pastas será reconstruída. Continuar?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Falha ao tentar reconstruir a árvore de pastas."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Verificar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Spam"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Baixar todas as mensagens abaixo de '%s' ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Baixar todas as mensagens"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em \"%s\"."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2489,26 +2495,26 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione \"/\" no final do nome)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para \"%s\":"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Não foi possível renomear a pasta \"%s\"."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta \"%s\"."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2517,11 +2523,11 @@ msgstr ""
 "Excluir a pasta de busca \"%s\" ?\n"
 "As mensagens reais não serão excluídas."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Excluir pasta de busca"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2534,20 +2540,30 @@ msgstr ""
 "\n"
 "Você realmente deseja excluí-las?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Você realmente deseja excluir todas as mensagens da lixeira?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Não spam"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Você realmente deseja excluir todas as mensagens da lixeira?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2556,34 +2572,34 @@ msgstr ""
 "Você deseja realmente excluir a caixa de correio \"%s\" ?\n"
 "(As mensagens NÃO são excluídas do disco)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Excluir caixa de correio"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Você realmente deseja excluir a conta IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Excluir conta IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Você deseja excluir o grupo de notícias \"%s\"?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Excluir grupo de notícias"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Você deseja excluir o grupo de notícias \"%s\"?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Excluir conta de grupo de notícias"
 
@@ -2596,7 +2612,7 @@ msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -2665,114 +2681,114 @@ msgstr "Selecionar diretório a importar"
 msgid "Select importing file"
 msgstr "Selecionar arquivo a importar"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr ""
 "Por favor especifique o nome do catálogo de endereços e o arquivo para "
 "importar."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Selecione e reordene os campos CSV para importar."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Arquivo importado."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Por favor selecione um arquivo."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Um nome deve ser informado para o Catálogo de Endereços."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Erro lendo campos CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Arquivo CSV importado com sucesso."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Selecionar Arquivo CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nome do arquivo"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Separados por vírgula"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Separados por tabulação"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Campo CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Campo do Catálogo de Endereços"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Reordene os campos do catálogo de endereços com as setas Cima/Baixo"
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Acima"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Abaixo"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Catálogo de Endereços :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nome do arquivo :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Registros :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Importar arquivo CSV para o Catálogo de Endereços"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Próxima"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Anterior"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Informação do Arquivo"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Campos"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Terminar"
 
@@ -2950,7 +2966,7 @@ msgstr "Saindo"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recebendo mensagem (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3045,16 +3061,16 @@ msgstr "Digite a senha"
 msgid "Protocol log"
 msgstr "Log do protocolo"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uso: %s [OPÇÃO]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [endreço]    abre janela de composição"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3064,23 +3080,23 @@ msgstr ""
 "                         abrir a janela de composição anexando os\n"
 "                         arquivos especificados"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              recebe novas mensgens"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          recebe novas mensagens de todas as contas"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 envia todas as mensagens da fila"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [pasta]...   mostra o número total de mensagens"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3088,47 +3104,47 @@ msgstr ""
 "  --status-full [pasta]...\n"
 "                         exibe o status de cada pasta"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open pasta/número abre a mensagem 'número' em uma nova janela"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir diretório    especifica o diretório que armazena os arquivos "
 "de configuração"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport porta        número da porta para comandos remotos via IPC"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 sair do Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                modo debug"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 exibe esta ajuda e sai"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              mostra informação de versão e sai"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Pressione qualquer tecla..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Codificação de nome de arquivo"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3152,20 +3168,20 @@ msgstr ""
 "\n"
 "Continuar?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Ainda há mensagens sendo escritas. Você realmente deseja sair?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Mensagens enviadas para a fila"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "Há mensagens não enviadas na caixa de saída. Você realmente deseja sair?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3173,20 +3189,20 @@ msgstr ""
 "O GnuPG não está instalado corretamente.\n"
 "Suporte à OpenPGP desabilitado."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Carregando plug-ins..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "outra cópia do Sylpheed já está sendo executada.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migração da configuração"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3528,15 +3544,15 @@ msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/E_xibir/Ver _fonte"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/E_xibir/_Todos os cabeçalhos"
 
@@ -3835,8 +3851,8 @@ msgstr "Criando janela principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -3905,7 +3921,7 @@ msgstr "Sylpheed - Visão de Pastas"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Responder"
 
@@ -3921,15 +3937,15 @@ msgstr "/Responder para o _remetente"
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a _lista"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Encami_nhar"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Encamin_har como anexo"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
@@ -3973,19 +3989,19 @@ msgstr "Você deseja sair deste programa?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Selecione uma pasta para abrir"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Opções de linha de comando"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uso: sylpheed [OPÇÃO]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4015,7 +4031,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4045,15 +4061,15 @@ msgstr ""
 "exibe esta ajuda e encerra\n"
 "exibe informação de versão e encerra"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport porta        número da porta para comandos remotos via IPC"
@@ -4111,7 +4127,7 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo \"%s\"."
@@ -4132,7 +4148,7 @@ msgstr "/_Salvar como..."
 msgid "/Save _all..."
 msgstr "/Salvar _tudo..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
@@ -4522,7 +4538,7 @@ msgstr "Digitar diretamente"
 msgid "Command output"
 msgstr "Saída de comando"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Definir os seguintes endereços automaticamente"
 
@@ -4774,7 +4790,7 @@ msgstr "Sintaxe"
 msgid "Registered actions"
 msgstr "Ações salvas"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -6132,28 +6148,28 @@ msgstr "Tipo"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Não exibir [...] ou (...) no início do assunto no sumário"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Remover [...] ou (...) do começo do assunto ao responder"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Conta"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Aplicar às subpastas"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "Usar também ao responder"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Responder para:"
 
@@ -6189,19 +6205,19 @@ msgstr "Anexo"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Data"
 
@@ -6211,7 +6227,7 @@ msgid "Number"
 msgstr "Número"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Para"
 
@@ -6231,43 +6247,61 @@ msgstr ""
 "Selecione as colunas que serão exibidas na lista de mensagens. Você\n"
 "pode modificar a ordem usando os botões Acima / Abaixo."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nome do Modelo"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Adicionar"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr "Sustituir"
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr "Símbolos"
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Modelos salvos"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Modelos"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nome do Modelo"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nome do Modelo"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Modelo"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Erro no formato do modelo"
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Excluir modelo"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Você realmente deseja excluir este modelo?"
 
@@ -6501,7 +6535,7 @@ msgstr "Procurando %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Procurando %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Sem data)"
 
@@ -6598,7 +6632,7 @@ msgstr "_Sobre"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - Caixa de mensagens remota POP3"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Nº"
 
@@ -7157,7 +7191,7 @@ msgstr "Recebendo lista de grupos de notícias..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista de grupos de notícias."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Pronto."
 
@@ -7166,344 +7200,344 @@ msgstr "Pronto."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupos de notícias recebidos (%s lidos)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "Res_ponder para"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "Res_ponder para/_todos"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "Res_ponder para/_remetente"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "Res_ponder para/_lista"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/M_over..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Marcar"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Marcar/_Marcar"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Marcar/_Desmarcar"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _não lida"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _lida"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Marcar/Marcar _conversa como lida"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marcar _todas como lidas"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Eti_queta"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Marcar como _spam"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Marcar como _não spam"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Re-_editar"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Adicionar reme_tente ao catálogo de endereços"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Criar regra de _filtro"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Criar regra de _filtro/_Automaticamente"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Criar regra de _filtro/Pelo _remetente"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Criar regra de _filtro/Pelo _destinatário"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Criar regra de _filtro/Pelo a_ssunto"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Criando visualizador de sumários...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Processando pasta (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Processar marca"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Algumas marcas foram deixadas. Processá-las?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Não foi possível estabelecer uma conexão IMAP.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "Procurar _novamente"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens não lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do início?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nenhuma mensagem etiquetada foi encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem não lida encontrada. Procurar do início?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d excluídas"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d não lidas, %d  no total (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d não lidas, %d no total"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como lida\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para exclusão\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Excluir a(s) mensagem(s)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Você realmente deseja excluir a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Excluindo mensagens duplicadas..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Selecione a pasta a ser movida"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Selecione a pasta a ser copiada"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Organizando conversas..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Desfazendo conversas..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
diff --git a/po/ro.po b/po/ro.po
index c1741a98..46f60d26 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-05-09 12:41+0200\n"
 "Last-Translator: Cristian Secară <cristi AT secarica DOT ro>\n"
 "Language-Team: Gnome Romanian Team <gnomero-list@lists.sourceforge.net>\n"
@@ -328,7 +328,7 @@ msgstr ""
 "Fișierul „%s” există deja.\n"
 "Nu se poate crea dosarul."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -513,11 +513,11 @@ msgstr "Găsit %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Configurația a fost salvată.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Filtru mesaj spam (manual)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Filtru mesaj spam"
 
@@ -662,7 +662,7 @@ msgstr ""
 "acest program; dacă nu, scrieți la Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -702,7 +702,7 @@ msgstr ""
 "coloana „G”\n"
 "pentru a activa recepționarea mesajelor la comanda „Verifică tot”."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -852,8 +852,8 @@ msgstr "Adăugare în agendă"
 msgid "Address"
 msgstr "Agendă"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Observații"
 
@@ -861,32 +861,32 @@ msgstr "Observații"
 msgid "Select Address Book Folder"
 msgstr "Selectați dosarul pentru agendă"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Adrese înregistrate automat"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Fișier"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Fișier/A_gendă nouă"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Fișier/_vCard nou"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Fișier/_JPilot nou"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Fișier/Server _LDAP nou"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -894,193 +894,193 @@ msgstr "/_Fișier/Server _LDAP nou"
 msgid "/_File/---"
 msgstr "/_Fișier/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Fișier/_Editează"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Fișier/Ș_terge"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Fișier/_Salvează"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Fișier/În_chide"
 
 # comun și în main menu și în rmb agendă
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Editare/_Copiază"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Editare/Li_pește"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/A_dresă"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/A_dresă/_Adresă nouă"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/A_dresă/_Grup nou"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/A_dresă/_Dosar nou"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/A_dresă/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/A_dresă/_Editează"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/A_dresă/Ș_terge"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Unelte"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Unelte/Importă un fișier _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Unelte/Importă un fișier _CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Ajutor"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Ajutor/_Despre"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/_Adresă nouă"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/_Grup nou"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/_Dosar nou"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
 # comun și la intrare în agendă și la rmb pe mesaj
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Șter_ge"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/_Copiază"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/Li_pește"
 
 # tooltip peste butonul Agendă
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Agendă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dosar"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Caută:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Către:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Șterge"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Adaugă"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Caută"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "În_chide"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Ștergere adresă (adrese)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Sigur doriți să ștergeți adresa (adresele) ?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1089,36 +1089,36 @@ msgstr ""
 "Vreți să ștergeți dosarul ȘI toate adresele din „%s” ?\n"
 "Dacă ștergeți doar dosarul, adresele vor fi mutate în dosarul părinte."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Ștergere dosar"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Doar _dosar"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Dosar și _adrese"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Sigur doriți să ștergeți „%s” ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Utilizator nou, fișierul index nu a putut fi salvat."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Utilizator nou, fișierele agendei nu au putut fi salvate."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Agenda veche a fost convertită cu succes."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1126,7 +1126,7 @@ msgstr ""
 "Agenda veche a fost convertită, dar\n"
 "fișierul index al noii agende nu a putut fi salvat."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1134,7 +1134,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, dar\n"
 "au fost create fișierele noi de agendă goală."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1142,7 +1142,7 @@ msgstr ""
 "Agenda nu a putut fi convertită, iar\n"
 "fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1150,15 +1150,15 @@ msgstr ""
 "Agenda nu a putut fi convertită\n"
 "și fișierele noi de agendă nu au putut fi create."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1169,78 +1169,78 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Eroare agendă"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Fișierul index al agendei nu a putut fi citit"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Eroare de conversie a agendei"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Conversie agendă"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Interfață"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Agendă"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Persoană"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Adresă de e-mail"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupă"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Server LDAP"
 
@@ -1252,11 +1252,11 @@ msgstr "Adrese comune"
 msgid "Personal address"
 msgstr "Adrese personale"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Notificare"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Avertisment"
 
@@ -1305,7 +1305,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Niciunul"
 
@@ -1321,8 +1321,8 @@ msgstr "/_Adăugă..."
 msgid "/_Remove"
 msgstr "/Ște_rge"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Proprietăți..."
 
@@ -1397,7 +1397,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/Desparte liniile aut_omat"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Vizualizare"
 
@@ -1648,7 +1648,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obține o parte a mesajului multiparte."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
@@ -1689,7 +1689,7 @@ msgstr "Sigur trimiteți acest mesaj către următoarele adrese ?"
 msgid "From:"
 msgstr "De la:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Subiect:"
 
@@ -1843,7 +1843,7 @@ msgstr "Tip MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Dimensiune"
 
@@ -1974,28 +1974,28 @@ msgstr "Trebuiesc furnizate un nume și o valoare."
 msgid "Edit Person Data"
 msgstr "Editare date persoană"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Nume afișat"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Nume"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Prenume"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Pseudonim"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adresă de e-mail"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2108,12 +2108,12 @@ msgstr "Editare dosar"
 msgid "Input the new name of folder:"
 msgstr "Introduceți noul nume al dosarului:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Dosar nou"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Introduceți numele dosarului nou:"
 
@@ -2130,7 +2130,7 @@ msgid "Edit JPilot Entry"
 msgstr "Editare înregistrare JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2316,202 +2316,208 @@ msgstr "Fișierul există deja. Vreți să îl înlocuiți ?"
 msgid "Select folder"
 msgstr "Selectare dosar"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Primite (Inbox)"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Trimise"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coadă"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Spam"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Dosar nou"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c” nu poate fi inclus în numele dosarului."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Dosarul „%s” există deja."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Dosarul „%s” nu a putut fi creat."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Creează un dosar _nou..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Redenumește dosarul..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Mută dosarul..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Șterge _dosarul"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/_Golește gunoiul"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/_Golește gunoiul"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Verifi_că pentru mesaje noi"
 
 # hm ? sau la singular ?
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruiește arborele de dosare"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Act_ualizează sumarul mesajelor"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Marc_hează totul ca citit"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/_Trimite mesajele de la coadă"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Caută me_saje..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Ed_itează condiția de căutare..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Desc_arcă"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Su_bscrie la grupul de știri..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Ște_rge grupul de știri"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Creare vizualizare dosar...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nou"
 
 # comun și când search și în dropdown-ul din fereastra principală
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Total"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Configurare informații dosar...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Configurare informații dosar..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare dosar %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare dosar %s ..."
 
 # hm ? sau la singular ?
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Reconstruire arbore de dosare"
 
 # hm ? sau la singular ?
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Arborele de dosare va fi reconstruit. Continuați ?"
 
 # hm ? sau la singular ?
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruire arbore de dosare..."
 
 # hm ? sau la singular ?
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruirea arborelui de dosare a eșuat."
 
 # nu este clar unde apare
 # (IMAP ?)
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Verifică pentru mesaje noi în toate dosarele..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Spam"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Este selectat dosarul %s\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descărcare mesaje în %s ..."
 
 # hm ?
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Descărcați toate mesajele din „%s” ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Descarcă toate mesajele"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A apărut o eroare în timpul descărcării mesajelor în „%s”."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2521,26 +2527,26 @@ msgstr ""
 "(dacă vreți să creați un dosar care să conțină subdosare,\n"
 " adăugați „/” la sfârșitul numelui)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceți noul nume pentru „%s”:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Redenumește dosarul"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nu se poate redenumi dosarul „%s”."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nu se poate muta dosarul „%s”."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2549,11 +2555,11 @@ msgstr ""
 "Ștergeți dosarul de căutare „%s” ?\n"
 "Mesajele reale NU sunt șterse de pe disc."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Șterge dosarul pentru căutare"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2566,20 +2572,30 @@ msgstr ""
 "\n"
 "Chiar vreți să ștergeți ?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nu se poate șterge dosarul „%s”."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Golire gunoi"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Ștergeți toate mesajele din dosarul de gunoi ?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Nu este spam"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Ștergeți toate mesajele din dosarul de gunoi ?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2588,34 +2604,34 @@ msgstr ""
 "Sigur doriți să eliminați căsuța poștală „%s” ?\n"
 "(Mesajele NU sunt șterse de pe disc)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Ștergere căsuță poștală"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sigur doriți să ștergeți contul IMAP4 „%s” ?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Ștergere cont IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sigur doriți să ștergeți grupul de știri „%s” ?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Ștergere grup de știri"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sigur doriți să ștergeți contul de știri „%s” ?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Ștergere cont de știri"
 
@@ -2628,7 +2644,7 @@ msgid "Creating header view...\n"
 msgstr "Creare vizualizare antet...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
@@ -2700,116 +2716,116 @@ msgstr "Selectați dosarul de import"
 msgid "Select importing file"
 msgstr "Selectați fișierul de importat"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Specificați numele agendei și a fișierului ce trebuie importat."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Selectați și reordonați câmpurile CSV de importat."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fișier importat."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Selectați un fișier."
 
 # hm ? sau specificat ?
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Trebuie furnizat numele agendei."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Eroare la citirea câmpurilor CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Fișier CSV importat cu succes."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Selectați fișierul CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Nume Fișier"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Separat prin virgule"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Separat prin taburi"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Câmp CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Câmp agendă"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Reordonați câmpurile agendei cu butoanele Mai sus și Mai jos."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Mai sus"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Mai jos"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Agendă:"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Nume Fișier:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Înregistrări:"
 
 # titlu de fereastră la import
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Import de fișier CSV în agendă"
 
 # hm ? sau înainte ?
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Următor"
 
 # hm ? sau anterior ? sau  înapoi ?
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Precedent"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Informații despre Fișier"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Câmpuri"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Terminat"
 
@@ -2988,7 +3004,7 @@ msgstr "Părăsire"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Recepționare mesaje (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3083,16 +3099,16 @@ msgstr "Introduceți parola"
 msgid "Protocol log"
 msgstr "Log protocol"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Utilizare: %s [OPȚIUNE]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    deschide fereastra de compoziție"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3102,23 +3118,23 @@ msgstr ""
 "                         deschide fereastra de compoziție cu fișierele\n"
 "                         specificate atașate"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              primește mesaje noi"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primește mesaje noi pentru toate conturile"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 trimite toate mesajele din coada de așteptare"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   arată numărul total de mesaje"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3126,48 +3142,48 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         arată starea fiecărui dosar"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum deschide mesajul în fereastră nouă"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 "  --configdir dirname    specifică directorul care conține fișierele de "
 "configurare"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 "  --ipcport portnum      specifică portul pentru comenzi la distanță IPC"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 ieșire Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                mod debug"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 afișează acest ajutor și ieși"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              afișează versiunea și ieși"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Apăsați orice tastă..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Codare de nume fișier"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3192,24 +3208,24 @@ msgstr ""
 "Continuați ?"
 
 # hm ? sigur cu \n
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr ""
 "Există cel puțin un mesaj în curs de compunere.\n"
 "Sigur doriți să ieșiți ?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Mesaje în coada de așteptare"
 
 # hm ? sigur cu \n
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr ""
 "În coada de așteptare se află unul sau mai multe mesaje netrimise.\n"
 "Ieșiți acum ?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3217,20 +3233,20 @@ msgstr ""
 "GnuPG nu este instalat corespunzător, sau versiunea lui este prea veche.\n"
 "Suportul pentru OpenPGP a fost dezactivat."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Se încarcă plugin-urile..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "rulează deja o altă sesiune Sylpheed.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migrarea configurației"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3579,15 +3595,15 @@ msgstr "/_Vizualizare/Codare caract_ere/Chinese (ISO-2022-CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vizualizare/Codare caract_ere/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Vizualizare/Deschide în fereastră _nouă"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Vizualizare/S_ursă mesaj"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/_Vizualizare/Toate _anteturile"
 
@@ -3888,8 +3904,8 @@ msgstr "Creare fereastră principală...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eșuat\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -3957,7 +3973,7 @@ msgstr "Sylpheed - Vizualizare dosar"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vizualizare mesaj"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
@@ -3973,15 +3989,15 @@ msgstr "/Răspunde _expeditorului"
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _listei de discuții"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Îna_intează"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Înaintează ca _atașament"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Redirecționea_ză"
 
@@ -4025,19 +4041,19 @@ msgstr "Ieșiți din acest program ?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Selectați dosarul de deschis"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Opțiuni de line de comandă"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Utilizare: sylpheed [OPȚIUNE]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4067,7 +4083,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4097,15 +4113,15 @@ msgstr ""
 "afișează acest ajutor și ieși\n"
 "afișează versiunea și ieși"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr ""
@@ -4164,7 +4180,7 @@ msgstr "Atașamente"
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nu se poate salva fișierul „%s”."
@@ -4185,7 +4201,7 @@ msgstr "/_Salvează ca..."
 msgid "/Save _all..."
 msgstr "/Salvează _tot..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Ti_părește..."
 
@@ -4582,7 +4598,7 @@ msgstr "Introducere directă"
 msgid "Command output"
 msgstr "Rezultat comandă"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Completare automată a următoarelor câmpuri de adrese"
 
@@ -4837,7 +4853,7 @@ msgstr " Ajutor sintaxă "
 msgid "Registered actions"
 msgstr "Acțiuni înregistrate"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nou)"
 
@@ -6210,29 +6226,29 @@ msgstr "Tip"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nu afișa [...] sau (...) la începutul subiectului în sumar"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Șterge [...] sau (...) la începutul subiectului când se răspunde"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Cont"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Aplică și la subdirectoare"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "Folosește și pentru răspuns"
 
 # obs: câmpul propriu de întoarcere când se răspunde cuiva, la fereastra de compunere
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Răspuns către:"
 
@@ -6268,19 +6284,19 @@ msgstr "Atașament"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Dată"
 
@@ -6290,7 +6306,7 @@ msgid "Number"
 msgstr "Număr"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Către"
 
@@ -6310,44 +6326,62 @@ msgstr ""
 "Selectați elementele de afișat la vizualizarea sumarului.\n"
 "Puteți modifica ordinea utilizând butoanele Mai sus și Mai jos."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Nume șablon"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Înregistrare"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Substituire "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Simboluri "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Șabloane înregistrate"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Șabloane"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Nume șablon"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Nume șablon"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Șablon"
 
 # hm ? sau eroare în formatul șablonului ?
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Eroare de format de șablon."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Șterge șablon"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Chiar vreți să ștergeți acest șablon ?"
 
@@ -6587,7 +6621,7 @@ msgstr "Căutare %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Căutare %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
@@ -6693,7 +6727,7 @@ msgstr "_Despre"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s -  Căsuță poștală POP3 la distanță"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Nr."
 
@@ -7254,7 +7288,7 @@ msgstr "Obținere listă grup de știri..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nu se poate recepționa lista de grup de știri."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Gata."
 
@@ -7263,344 +7297,344 @@ msgstr "Gata."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d grupuri de știri primite (%s citite)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Răsp_uns"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Răsp_uns/Răspunde _tuturor"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Răsp_uns/Răspunde _expeditorului"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Răsp_uns/Răspunde _listei de discuții"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Mu_tă..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Copiază..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Marcare"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Marcare/_Marchează"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Marcare/_Demarchează"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Marcare/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcare/Marchează ca _necitit"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcare/Marchează ca _citit"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Marcare/Marchează _firul de discuție ca citit"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcare/Marchează _totul ca citit"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Culoare etic_hetă"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Marchează ca _spam"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Marchează ca _util"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Re_editează"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Adaugă _expeditorul în agendă..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Creează o regulă de f_iltrare"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Creează o regulă de f_iltrare/_Automat"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Creează o regulă de f_iltrare/pe baza câmpului _De la"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Creează o regulă de f_iltrare/pe baza câmpului _Către"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Creează o regulă de f_iltrare/pe baza câmpului _Subiect"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Creare vizualizare sumară...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Se scanează dosarul (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Procesare marcaje"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Au rămas unele marcaje. Doriți să fie procesate ?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Scanare dosar (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Nu s-a putut stabili conexiunea IMAP.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Caută din nou"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Nu mai sunt mesaje necitite"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Nu sunt mesaje necitite."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Mergeți la dosarul următor ?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Nu mai sunt mesaje noi"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj nou. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Nu sunt mesaje noi."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nu s-a găsit nici un mesaj nou. Mergeți la dosarul următor ?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Nu mai sunt mesaje marcate"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Nu sunt mesaje marcate."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutați de la început ?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Nu mai sunt mesaje etichetate"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj etichetat. Căutați de la sfârșit ?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Nu sunt mesaje etichetate"
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaje etichetat. Căutați de la început ?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Atracție mesaje după subiect..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d șters(e)"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mutat(e)"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiat(e)"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " element(e) selectat(e)"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d noi, %d necitite, %d în total (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nou(i), %d necitit(e), %d în total"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Sortare sumar..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tSe configurează sumarul din datele de mesaj..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Se configurează sumarul din datele de mesaj..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache sumar (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ștergere\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Ștergere mesaj(e)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Chiar vreți să ștergeți mesajul (sau mesajele) din gunoi ?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Ștergere mesaje duplicate..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Destinația este aceeași cu dosarul curent."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Selectați dosarul de mutat"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este setat pentru copiere în %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Destinația pentru copiere este aceeași cu dosarul curent."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Selectați dosarul de copiat"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "A apărut o eroare în timpul procesării mesajelor."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Construire fire de discuție..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuție..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d messaj(e) au fost filtrate."
diff --git a/po/ru.po b/po/ru.po
index 5568c050..6932c9d5 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-06-15 15:18+0400\n"
 "Last-Translator: \n"
 "Language-Team: Russian <kde-russian@lists.kde.ru>\n"
@@ -326,7 +326,7 @@ msgstr ""
 "Файл \"%s\" уже существует.\n"
 "Нельзя создать папку с таким же именем."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -511,11 +511,11 @@ msgstr "Найдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Настройки сохранены.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Фильтр спама"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Фильтр спама"
 
@@ -660,7 +660,7 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -697,7 +697,7 @@ msgstr ""
 "Пометьте в колонке \"G\" учётные записи, которые нужно проверять\n"
 "по команде \"Получить все\"."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -838,8 +838,8 @@ msgstr "Добавление адреса в книгу"
 msgid "Address"
 msgstr "Адрес"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Примечание"
 
@@ -847,33 +847,33 @@ msgstr "Примечание"
 msgid "Select Address Book Folder"
 msgstr "Выберите папку в адресной книге"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Зарегистрированные шаблоны"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/Файл/Новая книга"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/Файл/Новый файл vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новый файл JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новый сервер LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -881,190 +881,190 @@ msgstr "/Файл/Новый сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/Файл/Правка"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/Файл/Удалить"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/Файл/Сохранить"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрыть"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Правка/Копировать"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Правка/Вставить"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/Адрес"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/Адрес/Новый адрес"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/Адрес/Новая группа"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/Адрес/Новая папка"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/Адрес/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/Адрес/Правка"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/Адрес/Удалить"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Инструменты"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Инструменты/Импорт файла LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/Инструменты/Импорт файла CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Справка"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Справка/О программе"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Новый адрес"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Новая группа"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Новая папка"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Удалить"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/Копировать"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/Вставить"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресная книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Поиск:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Скрытно:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Удалить"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Добавить"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Поиск"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "Закрыть"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Удалить адрес(а)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Действительно удалить адрес(а)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1073,36 +1073,36 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Удалить папку"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Только папку"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Папку и адреса"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Действительно удалить \"%s\"?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Новый пользователь; не удалось сохранить индексный файл."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Новый пользователь; не удалось сохранить файлы адресной книги."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Старая адресная книга успешно преобразована."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1110,7 +1110,7 @@ msgstr ""
 "Старая адресная книга преобразована,\n"
 "не удалось сохранить новый индексный файл."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1118,7 +1118,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "создана пустая адресная книга."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1126,7 +1126,7 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "ошибка при создании файлов адресной книги."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1134,15 +1134,15 @@ msgstr ""
 "Не удалось преобразовать адресную книгу,\n"
 "кроме того, произошла ошибка при создании файлов новой адресной книги."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1153,77 +1153,77 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Ошибка при работе с адресной книгой"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Старая адресная книга преобразована, не удалось сохранить новый индексный "
 "файл"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, создана пустая адресная книга."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, ошибка при создании новых файлов "
 "адресной книги"
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr ""
 "Не удалось преобразовать адресную книгу, кроме того, произошла ошибка при "
 "создании новых файлов адресной книги."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Не удалось прочитать индекс адресов"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Ошибка преобразования адресной книги"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Преобразование адресной книги"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Интерфейс"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресная книга"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Контакт"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Адрес E-Mail"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Группа"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1235,11 +1235,11 @@ msgstr "Общие адреса"
 msgid "Personal address"
 msgstr "Личные адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Уведомление"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Предупреждение"
 
@@ -1286,7 +1286,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Нет"
 
@@ -1302,8 +1302,8 @@ msgstr "/Добавить..."
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
@@ -1377,7 +1377,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/Вид"
 
@@ -1626,7 +1626,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
@@ -1667,7 +1667,7 @@ msgstr "Отправить сообщения по следующим адрес
 msgid "From:"
 msgstr "От:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -1816,7 +1816,7 @@ msgstr "Тип MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Размер"
 
@@ -1946,28 +1946,28 @@ msgstr "Необходимо указать имя и значение."
 msgid "Edit Person Data"
 msgstr "Редактирование сведений о контакте"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Отображаемое имя"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Фамилия"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Имя"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Псевдоним"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Адрес E-Mail"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Псевдоним"
 
@@ -2079,12 +2079,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2101,7 +2101,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редактирование записи JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2285,193 +2285,199 @@ msgstr "Файл существует. Перезаписать?"
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Спам"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ \"%c\" не может входить в имя папки."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка \"%s\" уже существует."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку \"%s\"."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Создать новую папку..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Переименовать папку..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/Переместить папку..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Удалить папку"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Очистить корзину"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Очистить корзину"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Проверить новые сообщения"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Перестроить дерево папок"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Обновить список сообщений"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "Пометить как прочитанные"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "Отправить сообщения из очереди"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Поиск сообщений..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Изменить условие поиска..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Загрузить"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Подписка на группу новостей..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Удалить группу новостей"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Создание области просмотра папок...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Новые"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Не прочитано"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Всего"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Установка информации о папке...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок будет перестроено. Продолжить?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Перестройка дерева папок..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Спам"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Загрузить все сообщения из %s ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Загружаются все сообщения"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из \"%s\"."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2481,26 +2487,26 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте \"/\" в конец имени)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для \"%s\":"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не удалось переименовать папку \"%s\"."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не удалось переместить папку \"%s\"."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2509,11 +2515,11 @@ msgstr ""
 "Удалить папку поиска \"%s\"?\n"
 "Это не приведёт к удалению сообщений."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Удалить папку поиска"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2526,20 +2532,30 @@ msgstr ""
 "\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки \"%s\"."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Не спам"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Удалить все сообщения из корзины?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2548,34 +2564,34 @@ msgstr ""
 "Удалить почтовый ящик \"%s\"?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учётную запись IMAP4 \"%s\"?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Удалить учётную запись IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей \"%s\"?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учётную запись новостей \"%s\"?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Удалить учётную запись новостей"
 
@@ -2588,7 +2604,7 @@ msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -2657,112 +2673,112 @@ msgstr "Выбор папки для импорта"
 msgid "Select importing file"
 msgstr "Выбор импортируемого файла"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Укажите название адресной книги и файл для импорта."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Выберите и отсортируйте поля CSV для импорта"
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Файл импортирован."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Пожалуйста, выберите файл."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Необходимо указать имя адресной книги."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Ошибка при чтении полей CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Файл CSV успешно импортирован."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Выбор файла CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Имя файла"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Разделенный запятой"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Разделенный tab"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "В"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Поле CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Поле адресной книги:"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Сортируйте поля адресной книги кнопками вверх и вниз"
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Вверх"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Вниз"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Адресная книга:"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Имя файла:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Записей:"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Импорт файла CSV в адресную книгу"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Далее"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Информация о файле"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Поля"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Завершение"
 
@@ -2940,7 +2956,7 @@ msgstr "Выход"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Получение сообщения (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3035,16 +3051,16 @@ msgstr "Ввод пароля"
 msgid "Protocol log"
 msgstr "Журнал"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Использование: %s [ПАРАМЕТР]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [адрес]      открыть окно создания сообщения"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3054,24 +3070,24 @@ msgstr ""
 "                         открыть окно создания сообщения с присоединёнными\n"
 "                         файлами"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              получить новые сообщения"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
 "  --receive-all          получить новые сообщения со всех учётных записей"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 отослать все сообщения из очереди"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [папка]...    вывести суммарное количество сообщений"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3079,45 +3095,45 @@ msgstr ""
 "  --status-full [папка]...\n"
 "                         вывести состояние указанных папок"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "··--open·folderid/msgnum·открыть сообщение в новом окне"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir каталог    указать каталог с файлами конфигурации"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "··--ipcport·portnum······задать портдля удаленной команды IPC"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 завершить работу Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим отладки"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 отобразить это описание и выйти"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              вывести информацию о версии и выйти"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Нажмите любую клавишу..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Кодировка имён файлов"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3141,19 +3157,19 @@ msgstr ""
 "\n"
 "Продолжить?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Есть редактируемое сообщение. Выходить?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Сообщения в очереди"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "В очереди есть неотправленные сообщения. Выходить?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3161,20 +3177,20 @@ msgstr ""
 "GnuPG установлен неправильно, или установлена устаревшая версия.\n"
 "Поддержка OpenPGP отключена."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Загрузка модулей..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "другая копия Sylpheed уже запущена.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Импорт предыдущей конфигурации"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3516,15 +3532,15 @@ msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/Вид/Показать исходный текст"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/Вид/Все заголовки"
 
@@ -3823,8 +3839,8 @@ msgstr "Создание главного окна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -3893,7 +3909,7 @@ msgstr "Sylpheed - Папки"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/Ответить"
 
@@ -3909,15 +3925,15 @@ msgstr "/Ответить отправителю"
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
@@ -3962,19 +3978,19 @@ msgstr "Выйти из программы?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Выбор папки"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Параметры командной строки"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Использование: sylpheed [ПАРАМЕТР]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4004,7 +4020,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4034,15 +4050,15 @@ msgstr ""
 "отобразить этоу подсказку и выйти\n"
 "вывести информацию о версии и выйти"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr "Специфические для Windows настройки:"
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr "--ipcport номер порта"
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr "задать портдля удаленной команды IPC"
 
@@ -4099,7 +4115,7 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr "Окно сообщения - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла \"%s\"."
@@ -4120,7 +4136,7 @@ msgstr "/Сохранить как..."
 msgid "/Save _all..."
 msgstr "/Сохранить все..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Печать..."
 
@@ -4510,7 +4526,7 @@ msgstr "Прямой ввод"
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Автоматически устанавливать адреса"
 
@@ -4762,7 +4778,7 @@ msgstr " Описание синтаксиса "
 msgid "Registered actions"
 msgstr "Зарегистрированные действия"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Новое)"
 
@@ -6120,28 +6136,28 @@ msgstr "Тип"
 msgid "Normal"
 msgstr "Обычный"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Не отображать [...] или (...) в начале темы сообщения в списке"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Удалять [...] или (...) в начале темы сообщения при ответе"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Учётная запись"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Применять к вложенным папкам"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "также использовать при ответе"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Адрес для ответов:"
 
@@ -6177,19 +6193,19 @@ msgstr "Вложение"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Дата"
 
@@ -6199,7 +6215,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Кому"
 
@@ -6219,43 +6235,61 @@ msgstr ""
 "Выберите столбцы для отображения в списке сообщений.\n"
 "Можно изменить порядок с помощью кнопок Вверх/Вниз."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Название шаблона"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Добавить"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr "Заменить"
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Символы "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Зарегистрированные шаблоны"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Шаблоны"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Название шаблона"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Название шаблона"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Неверный формат шаблона."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Удалить шаблон"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Удалить этот шаблон?"
 
@@ -6489,7 +6523,7 @@ msgstr "Поиск в папке \"%s\" (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Поиск в папке \"%s\"..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
@@ -6586,7 +6620,7 @@ msgstr "О программе"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 удаленный почтовый ящик"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Номер"
 
@@ -7145,7 +7179,7 @@ msgstr "Получение списка групп новостей..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Не удалось получить список групп новостей."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Выполнено."
 
@@ -7154,342 +7188,342 @@ msgstr "Выполнено."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d групп новостей (%s загружено)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Ответить..."
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Ответить.../Всем"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Ответить.../Отправителю"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Ответить.../В список рассылки"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Переместить"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/Копировать"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Отметить"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/Отметить/Отметить"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/Отметить/Снять отметку"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/Отметить/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Отметить/Пометить как непрочитанное"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Отметить/Пометить как прочитанное"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/Отметить/Пометить обсуждение как прочитанное"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Выделение цветом"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "Пометить как спам"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Пометить как не спам"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Изменить"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Добавить отправителя в адресную книгу"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Создать правило фильтрации"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Создать правило фильтрации/Автоматически"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Создать правило фильтрации/По отправителю"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Создать правило фильтрации/По получателю"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Создать правило фильтрации/По теме"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Создание области просмотра списка...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Просмотр папки (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Обработка меток"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Несколько меток осталось. Обработать их?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Просмотр папки (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Не удалось открыть сеанс связи IMAP4.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "Искать снова"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Нет непрочитанных сообщений"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Непрочитанные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Нет непрочитанных сообщений."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Непрочитанные сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Нет новых сообщений"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Новые сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Нет новых сообщений."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Новые сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Нет выделенных цветом сообщений"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Нет выделенных цветом сообщений."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Группировка сообщений по темам..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d удалено"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перемещено"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопировано"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " сообщений выбрано"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d непрочитанных, %d всего (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d непрочитанных, %d всего"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удалённое\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Удаление повторяющихся сообщений..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Выбор папки назначения"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Выбор папки назначения"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
diff --git a/po/sk.po b/po/sk.po
index 10b5e6d3..31766ff5 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -323,7 +323,7 @@ msgstr ""
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -503,12 +503,12 @@ msgstr "Nájdené %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Nastavenie uložené.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Priečinok"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Priečinok"
@@ -652,7 +652,7 @@ msgstr ""
 "programom. Ak to tak nie je, napíšte na adresu Free Software Foundation, "
 "Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -690,7 +690,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -833,8 +833,8 @@ msgstr "Pridať adresu do adresára"
 msgid "Address"
 msgstr "Adresár"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Poznámky"
 
@@ -842,34 +842,34 @@ msgstr "Poznámky"
 msgid "Select Address Book Folder"
 msgstr "Vyberte priečinok adresára"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrované pravidlá"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Súbor"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Súbor/Nový _Adresár"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Súbor/Nový _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Súbor/Nový _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Súbor/Nový _Server"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -877,196 +877,196 @@ msgstr "/_Súbor/Nový _Server"
 msgid "/_File/---"
 msgstr "/_Súbor/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Súbor/_Upraviť"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Súbor/Z_mazať"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Súbor/U_ložiť"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Súbor/_Zavrieť"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Úp_ravy/_Kopírovať"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nová _Adresa"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nová _Skupina"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Nový _Priečinok"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresa/--- "
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Upraviť"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/Z_mazať"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Nástroje"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Nástroje/Importovať súbor _LDIF"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Nápo_veda"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Nápo_veda/_O programe"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nová _Adresa"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nová _Skupina"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopírovať..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Úp_ravy/_Prilepiť"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Otvoriť adresár"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Priečinok"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Hľadať"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Zmazať"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Pridať"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Hľadať"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Zavrieť"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Zmazať adresu(y)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Naozaj zmazať adresu(y)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1075,38 +1075,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Len priečinok"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Priečinok aj adresy"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Naozaj zmazať '%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nový uživateľ; nepodarilo sa uložiť indexový súbor."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Nový uživateľ; nedajú sa uložiť súbory adresára."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Konverzia starého adresára prebehla úspešne."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1114,7 +1114,7 @@ msgstr ""
 "Konverzia starého adresára prebehla,\n"
 "nedá sa uložiť indexový súbor nového adresára"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1122,7 +1122,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "ale boli vytvorené prázdne súbory nového adresára."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1130,7 +1130,7 @@ msgstr ""
 "Nedá sa konvertovať starý adresár,\n"
 "nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1138,17 +1138,17 @@ msgstr ""
 "Nedá sa konvertovať starý adresár\n"
 "a nedajú sa ani vytvoriť súbory nového adresára."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1156,81 +1156,81 @@ msgid ""
 "%s%c%s"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Chyba v adresári"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Nedá sa načítať zoznam adries"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Chyba pri konverzii adresára"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Konverzia adresára"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Ovládanie"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresár"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "E-mailová adresa"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP server"
 
@@ -1242,11 +1242,11 @@ msgstr "Spoločná adresa"
 msgid "Personal address"
 msgstr "Súkromná adresa"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Upozornenie"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Varovanie"
 
@@ -1293,7 +1293,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Žiadna"
 
@@ -1309,8 +1309,8 @@ msgstr "/_Pridať..."
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -1390,7 +1390,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Zobraziť"
 
@@ -1674,7 +1674,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
@@ -1718,7 +1718,7 @@ msgstr "Automaticky nastaviť nasledujúce adresy"
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Predmet:"
 
@@ -1866,7 +1866,7 @@ msgstr "MIME typ"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -1998,28 +1998,28 @@ msgstr "Musíte zadať názov a hodnotu."
 msgid "Edit Person Data"
 msgstr "Upraviť údaje o kontakte"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Zobraziť meno"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Priezvisko"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Krstné meno"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Prezývka"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-mailová adresa"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2134,12 +2134,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2156,7 +2156,7 @@ msgid "Edit JPilot Entry"
 msgstr "Upraviť záznam JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2350,200 +2350,206 @@ msgstr ""
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Premenovať priečinok..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Zmazať priečinok"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Vyprázdniť kôš"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/Oz_načiť/Označiť ako _prečítané"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Vy_hľadať v správach..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žiadne neprečítané správy."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prih_lásiť sa do diskusnej skupiny"
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Odstrániť _diskusnú skupinu"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Vytváram náhľad pre priečinok...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nový"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Nastavujem informácie o priečinku...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom priečinkov bude obnovený. Pokračovať?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2553,26 +2559,26 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2581,12 +2587,12 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2597,21 +2603,31 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Predmet"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Zmazať všetky správy v koši?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2620,34 +2636,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2660,7 +2676,7 @@ msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -2740,120 +2756,120 @@ msgstr "Zvoľte súbor pre import"
 msgid "Select importing file"
 msgstr "Zvoľte súbor pre import"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Prosím zvoľte názov adresára a súboru pre import."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Zvoľte a premenujte názvy LDIF polí pre import."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Súbor importovaný."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Prozím zvoľte súbor."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Nebol zadaný názov adresára."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Chyba pri čítaní LDIF polí."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "Súbor LDIFbol úspešne importovaný."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Vyberte súbor vCard"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Názov súboru"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF pole"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adresár :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Nahor"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Nadol"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adresár :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Názov súboru :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Záznamy:"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Importovať súbor LDIF do adresára"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Nasledujúca"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Predchádzajúci"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Údaje o súbore"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF pole"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Dokončiť"
 
@@ -3034,7 +3050,7 @@ msgstr "Odpájam sa"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prijímam správu (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3128,16 +3144,16 @@ msgstr "Zadajte heslo"
 msgid "Protocol log"
 msgstr "Záznam protokolu"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]    otvorí okno pre písanie novej správy"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3148,23 +3164,23 @@ msgstr ""
 "uvedenými\n"
 "                         súbormi"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prijme nové správy"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          prijme nové správy pre všetky kontá"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošle všetky správy vo výstupnej fronte"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [priečinok]...   zobrazí celkový počet správ"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3172,50 +3188,50 @@ msgstr ""
 "  --status-full [priečinok]...\n"
 "                        zobrazí stav jednotlivých priečinkov"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                ladiaci mód"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                zobrazí túto nápovedu a ukončí program"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr ""
 "  --version                zobrazí informácie o verzii a ukončí program"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "alebo stlačte klávesu 'y'.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Výstupné kódovanie znakov"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3229,19 +3245,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Máte rozpísanú správu. Naozaj ukončiť?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Správy vo fronte"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Vo fronte sú neodoslané správy. Ukončiť program?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3249,21 +3265,21 @@ msgstr ""
 "GnuPG nie je nainštalované správne, alebo jeho verzia je príliš stará.\n"
 "Podpora OpenPGP je vypnutá."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "už beží iná kópia Sylpheedu.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Nastavenie akcií"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3631,15 +3647,15 @@ msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Zobraziť/Zdrojový kód správ_y"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Zobraziť/Všetky _hlavičky"
@@ -3952,8 +3968,8 @@ msgstr "Vytváram hlavné okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -4025,7 +4041,7 @@ msgstr "Sylpheed - Zobrazenie priečinku"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
@@ -4044,15 +4060,15 @@ msgstr "/O_dpovedať komu/_odosielateľovi"
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
@@ -4099,22 +4115,22 @@ msgstr "Ukončiť program"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Zvoľte priečinok"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Nebol zadaný príkazový riadok."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Použitie: %s [VOĽBY]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4131,7 +4147,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4148,15 +4164,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4213,7 +4229,7 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
@@ -4235,7 +4251,7 @@ msgstr "/_Uložiť ako..."
 msgid "/Save _all..."
 msgstr "/_Uložiť ako..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Tlačiť..."
 
@@ -4648,7 +4664,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
@@ -4905,7 +4921,7 @@ msgstr " Nápoveda syntaxe "
 msgid "Registered actions"
 msgstr "Registrované akcie"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nové)"
 
@@ -6335,28 +6351,28 @@ msgstr "Typ"
 msgid "Normal"
 msgstr "Obyčajný"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nezobrazovať [...] alebo (...) na začiatku názvu v zozname správ"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Zmazať [...] alebo (...) na začiatku názvu v zozname správ"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Konto"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Platí aj pre podpriečinky"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "použiť aj pri odpovedaní"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
@@ -6395,19 +6411,19 @@ msgstr "Príloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Dátum"
 
@@ -6417,7 +6433,7 @@ msgid "Number"
 msgstr "Číslo"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Komu:"
@@ -6440,43 +6456,61 @@ msgstr ""
 "meniť poradie pomocou tlačítiek Nahor / Nadol, alebo presúvaním\n"
 "položiek pomocou myši."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Názov šablóny"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registrovať"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Nahradiť "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Symboly "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registrované šablóny"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Šablóny"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Názov šablóny"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Názov šablóny"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Šablóna"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Chyba formátu šablóny."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Zmazať šablónu"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Naozaj chcete zmazať túto šablónu?"
 
@@ -6726,7 +6760,7 @@ msgstr "Filtrujem..."
 msgid "Searching %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
@@ -6834,7 +6868,7 @@ msgstr "O programe"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Č."
 
@@ -7400,7 +7434,7 @@ msgstr "Nedá sa získať zoznam diskusných skupín."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nedá sa získať zoznam diskusných skupín."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Hotovo."
 
@@ -7409,353 +7443,353 @@ msgstr "Hotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "Prijatých %d diskusných skupín (prečítaných %s)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/O_dpovedať komu"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/O_dpovedať komu/_všetkým"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Pre_sunúť"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopírovať..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Oz_načiť"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/Oz_načiť/Oz_načiť"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/Oz_načiť/_Odznačiť"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/Oz_načiť/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Oz_načiť/Označiť ako n_eprečítané"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Oz_načiť/Označiť ako _prečítané"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/Oz_načiť/Označiť ako _prečítané"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/Oz_načiť/Označiť _všetky ako prečítané"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/_Farebné označenie"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Nastaviť ako východzie"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Znovu upraviť"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Vytvor_iť pravidlo filtra"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Vytvor_iť pravidlo filtra/_Automaticky"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _odosielateľa"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _príjemcu"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Vytvor_iť pravidlo filtra/podľa p_redmetu"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Vytváram zoznam správy...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Spracovať značky"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Ostali nejaké značky. Spracovať?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Hľadať znova"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " položiek zvolených"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Zvoľte priečinok"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Zvoľte priečinok"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 00da2ace..2a24e4c7 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -326,7 +326,7 @@ msgstr ""
 "Datoteka `%s' že obstaja.\n"
 "Ne morem narediti imenika."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -508,12 +508,12 @@ msgstr "Najden %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je shranjena.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Mapa"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Mapa"
@@ -660,7 +660,7 @@ msgstr ""
 "programom; če ga niste, pišite na Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, ZDA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -698,7 +698,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -839,8 +839,8 @@ msgstr "Dodaj naslov v adresar"
 msgid "Address"
 msgstr "Naslov"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Opombe"
 
@@ -848,34 +848,34 @@ msgstr "Opombe"
 msgid "Select Address Book Folder"
 msgstr "Izberite mapo za adresar"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrirana pravila"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _Knjiga"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _v kartica"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Nov _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Nov _strežnik"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -883,196 +883,196 @@ msgstr "/_Datoteka/Nov _strežnik"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Urejanje"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Brisanje"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Shranjevanje"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zapri"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Uredi/_Kopiraj"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Naslov"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Naslov/Nov n_aslov"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Naslov/Nova _skupina"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Naslov/Nova _mapa"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Naslov/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Naslov/_Urejanje"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Naslov/_Brisanje"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Orodja"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Orodja/Uvoz datoteke _LDIF"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoč"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoč/_O programu"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nov n_aslov"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nova _skupina"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/Prepiš_i..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Uredi/_Prilepi"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Imenik naslovov"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapa"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Skp:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Izbriši"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodajanje"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Iskanje"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Zapri"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Brisanje naslova"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Res želite izbrisati naslov(e)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1081,38 +1081,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo mapa"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Mapa in naslovi"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Res želite izbrisati '%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Nov uporabnik, ne morem shraniti indeksne datoteke."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Nov uporabnik, ne morem shraniti datotek z iminiki naslovov."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Star imenik naslovov je bil uspešno pretvorjen."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1120,7 +1120,7 @@ msgstr ""
 "Stari imenik naslovov pretvorjen,\n"
 "ne morem shraniti nove indeksne datoteke naslovov"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1128,7 +1128,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "sem pa naredil prazne nove datoteke imenikov naslovov."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1136,7 +1136,7 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov,\n"
 "ne morem narediti novih datotek z imeniki naslovov."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1144,17 +1144,17 @@ msgstr ""
 "Ne morem pretvoriti imenika naslovov\n"
 "in ne morem narediti novih datotek z imeniki naslovov"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Pretvarjam imenik naslovov"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1162,80 +1162,80 @@ msgid ""
 "%s%c%s"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Napaka v imeniku naslovov"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Ne morem prebrati indeksa naslovov"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Napaka pri pretvorbi imenika naslovov"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Pretvorba imenika naslovov"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Vmesnik"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Imenik naslovov"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Oseba"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Elektronski naslov"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Skupina"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "v-kartica"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Strežnik LDAP"
 
@@ -1247,11 +1247,11 @@ msgstr "Skupni naslov"
 msgid "Personal address"
 msgstr "Osebni naslov"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Opomba"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Opozorilo"
 
@@ -1298,7 +1298,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Nič"
 
@@ -1314,8 +1314,8 @@ msgstr "/_Dodaj"
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
@@ -1396,7 +1396,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Pogled"
 
@@ -1680,7 +1680,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
@@ -1724,7 +1724,7 @@ msgstr "Samodejno nastavi sledeče naslove"
 msgid "From:"
 msgstr "Pošiljatelj:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Zadeva:"
 
@@ -1871,7 +1871,7 @@ msgstr "Tip MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Velikost"
 
@@ -2004,28 +2004,28 @@ msgstr "Ime in vrednost morata biti podana."
 msgid "Edit Person Data"
 msgstr "Urejanje podatkov o osebi"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Prikaži ime"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Priimek"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Vzdevek"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Elektronski Naslov"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Vzdevek"
 
@@ -2139,12 +2139,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2161,7 +2161,7 @@ msgid "Edit JPilot Entry"
 msgstr "Urejanje vnosa JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2354,201 +2354,207 @@ msgstr ""
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Naredi _novo mapo..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/I_zbriši mapo..."
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Izprazni smetnjak"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/_Oznaka/Označi kot _prebrano"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Iskanje sporočil..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ni neprebranih sporočil."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Vpis na novičarsko skupino..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Odstrani skupino novic"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Delam mapo View...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Med pošiljanjem sporočila %s je prišlo do napake."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2558,26 +2564,26 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2586,12 +2592,12 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2602,21 +2608,31 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Zadeva"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Izbrišem vsa sporočila v smetnjaku?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2625,34 +2641,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2665,7 +2681,7 @@ msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -2745,120 +2761,120 @@ msgstr "Izberite datoteko za uvoz"
 msgid "Select importing file"
 msgstr "Izberite datoteko za uvoz"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Prosim, določite ime adresarja in datoteko za uvoz."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Izberite in preimenujte ime polj LDIF za uvoz"
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Datoteka uvožena."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Prosim, izberite datoteko."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Ime imenika naslovov mora biti podano."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Napaka pri branju polj LDIF."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "Datoteka LDIF uspešno uvožena."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Izberite datoteko v-kartice"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "Polje LDIF"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adresar :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Gor"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Dol"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adresar :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Ime datoteke :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Zapisi :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Uvozi datoteko LDIF v imenik naslovov"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Naslednji"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Prejšnji"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Podatki o datoteki"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "Polje LDIF"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Končaj"
 
@@ -3039,7 +3055,7 @@ msgstr "Zapuščam"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Prenašam sporočilo (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3128,16 +3144,16 @@ msgstr "Vnesite geslo"
 msgid "Protocol log"
 msgstr "Dnevnik protokola"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [naslov]     odpri okno za sestavljanje novega sporočila"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3147,73 +3163,73 @@ msgstr ""
 "                         odpri okno za sestavljanje s pripetimi\n"
 "                         podanimi datotekami"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              poberi nova sporočila"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          poberi nova sporočila z vseh računov"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 pošlji vsa čakajoča sporočila"
 
-#: src/main.c:582
+#: src/main.c:585
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:583
+#: src/main.c:586
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               prikaži skupno število sporočil"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                razhroščevalni način"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaži to pomoč in končaj"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikaži informacijo o različici in končaj"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ali pritisnite tipko `y'.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izhodni nabor znakov"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3227,19 +3243,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Še vedno sestavljate sporočilo. Ali naj res končam?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Čakajoča sporočila"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Nekaj neposlamih sporočil je na čakanju. Ali naj končam?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3247,21 +3263,21 @@ msgstr ""
 "GnuPG ni pravilno nameščen ali pa je različica prestara.\n"
 "Podpora za OpenPGP je izključena."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "Sylpheed že teče.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pišem nastavitve dejanj..\n"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3630,15 +3646,15 @@ msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Pogled/I_zvirnik sporočila"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pogled/Vsa _zaglavja"
@@ -3956,8 +3972,8 @@ msgstr "Ustvarjam glavno okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -4028,7 +4044,7 @@ msgstr "Syčpheed - ogled mape"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
@@ -4047,15 +4063,15 @@ msgstr "/Odgovor _za/_pošiljatelja"
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
@@ -4102,22 +4118,22 @@ msgstr "Ali naj končam ta program?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Izberi mapo"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Ukazna vrstica ni nastavljena."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Uporaba: %s [MOŽNOST]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4134,7 +4150,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4151,15 +4167,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4216,7 +4232,7 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
@@ -4238,7 +4254,7 @@ msgstr "/_Shrani kot..."
 msgid "/Save _all..."
 msgstr "/_Shrani kot..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Natisni..."
 
@@ -4651,7 +4667,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Ukaz"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Samodejno nastavi sledeče naslove"
 
@@ -4905,7 +4921,7 @@ msgstr " Pomoč pri skladnji "
 msgid "Registered actions"
 msgstr "Registrirana dejanja"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Nov)"
 
@@ -6337,28 +6353,28 @@ msgstr "Tip"
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Račun"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Udejani na podmapah"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "uporabi tudi ob odgovoru"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Odgovor za:"
 
@@ -6397,19 +6413,19 @@ msgstr "Priloga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Datum"
 
@@ -6419,7 +6435,7 @@ msgid "Number"
 msgstr "Število"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6441,43 +6457,61 @@ msgstr ""
 "Izberite dele za prikaz ob ogledu povzetka. Lahko spremenite\n"
 "vrstni red z gumboma Gor / Dol ali z vlečenjem delov."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Ime predloge"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "_Pogledriraj"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Zamenjaj "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registrirane predloge"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Predloge"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Ime predloge"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Ime predloge"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Predloga"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Napaka pri oblikovanju predloge."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Izbriši predlogo"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Ali res želite izbrisati to predlogo?"
 
@@ -6726,7 +6760,7 @@ msgstr "Filtriram..."
 msgid "Searching %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
@@ -6834,7 +6868,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Ne."
 
@@ -7400,7 +7434,7 @@ msgstr "Ne morem potegniti seznama novičarskih skupin."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne morem potegniti seznama novičarskih skupin."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Opravljeno."
 
@@ -7409,354 +7443,354 @@ msgstr "Opravljeno."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d sprejetih novičarskih skupin (%s prebranih)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Odgovor _za"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Odgovor _za/_vse"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/Pre_stavi..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/Prepiš_i..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Oznaka"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Oznaka/_Označi"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Oznaka/O_dznači"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Oznaka/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Oznaka/Označi kot _neprebrano"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Oznaka/Označi kot _prebrano"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Oznaka/Označi kot _prebrano"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Oznaka/Označi _vsa kot prebrana"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Barvanje oz_nak"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Nastavi kot privzeto"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/_Znova uredi"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Ustvari pravilo za f_iltriranje"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Ustvari pravilo za f_iltriranje/S_amodejno"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Ustvari pravilo za f_iltriranje/po p_ošiljatelju"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Ustvari pravilo za f_iltriranje/po _naslovniku"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Ustvari pravilo za f_iltriranje/po _zadevi"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Delam ogled povzetka...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Oznaka procesa"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Nekaj oznak je ostalo. Naj obdelam?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nobeno neprebrano sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Ni neprebranih sporočil."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr ""
 "Nobeno neprebrano sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Ni novih sporočil."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Ni več označenih sporočil"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Ni označenih sporočil."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Ni več sporočil z oznako"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Ni sporočil z oznako"
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Privlačim sporočila po zadevi..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Izberi mapo"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Izberi mapo"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
diff --git a/po/sr.po b/po/sr.po
index da2279c2..2703b8ac 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -327,7 +327,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -509,12 +509,12 @@ msgstr "Pronađeno %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfiguracija je spremljena.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Direktorijum"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "Direktorijum"
@@ -660,7 +660,7 @@ msgstr ""
 "niste, pišite ne Free Software Foundation, Inc., 59 Temple Place - Suite "
 "330, Boston, MA 02111-1307, SAD."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -698,7 +698,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -839,8 +839,8 @@ msgstr "Dodaj adresu u adresar"
 msgid "Address"
 msgstr "Adresa"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Beleške"
 
@@ -848,34 +848,34 @@ msgstr "Beleške"
 msgid "Select Address Book Folder"
 msgstr "Odaberite direktorijum adresara"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Zabeležena pravila"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Datoteka"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Datoteka/Nova _knjiga"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Datoteka/Nova _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Datoteka/Novi _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Datoteka/Novi _server"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -883,196 +883,196 @@ msgstr "/_Datoteka/Novi _server"
 msgid "/_File/---"
 msgstr "/_Datoteka/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Datoteka/_Izmeni"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Datoteka/_Obriši"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Datoteka/_Sačuvaj"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Datoteka/_Zatvori"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Izmeni/_Kopiraj"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adresa"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adresa/Nova _adresa"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adresa/Nova _grupa"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adresa/Novi _direktorijum"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adresa/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adresa/_Izmeni"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adresa/O_briši"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Alati"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Datoteka/Unesi _LDIF datoteku"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Pomoć"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Pomoć/_O"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Nova _adresa"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Nova _grupa"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Obriši"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiranje..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Izmeni/U_baci"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adresar"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Direktorijum"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Obriši"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Dodaj"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Pretraga"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Zatvori"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Obriši adresu/e"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Zaista obrisati adresu/e?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1082,38 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Samo direktorijum"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Direktorijum i adrese"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Zaista obrisati `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Novi korisnik, ne mogu sačuvati index datoteku."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Novi korisnik, ne mogu sačuvati datoteke adresara."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Stari adresar uspešno prebačen."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1121,7 @@ msgstr ""
 "Stari adresar ne može biti prebačen,\n"
 "ne mogu sačuvati novu index datoteku adresara."
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Ne mogu prebaciti adesar,\n"
 "ali sam kreirao nove prazne datoteke adresara."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1137,7 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1145,17 @@ msgstr ""
 "Ne mogu prebaciti adresar,\n"
 "i ne mogu napraviti nove datoteke adresara."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Greška pri prebacivanju adresara"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Prebacivanje adresara"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,73 +1163,73 @@ msgid ""
 "%s%c%s"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Greška adresara"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Ne mogu čitati index adresara"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Greška pri unosu adresara"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Unos adresara"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Izgled programa"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adresar"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Osoba"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Adresa e-pošte"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupa"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP Server"
 
@@ -1241,11 +1241,11 @@ msgstr "Uobičajene adrese"
 msgid "Personal address"
 msgstr "Lične adrese"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Obaveštenje"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Upozorenje"
 
@@ -1292,7 +1292,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ništa"
 
@@ -1308,8 +1308,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
@@ -1390,7 +1390,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Pregled"
 
@@ -1674,7 +1674,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1718,7 +1718,7 @@ msgstr "Automatski postavi sledeće adrese"
 msgid "From:"
 msgstr "Od:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tema:"
 
@@ -1866,7 +1866,7 @@ msgstr "MIME tip"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Veličina"
 
@@ -1999,28 +1999,28 @@ msgstr "Ime i iznos moraju biti navedeni."
 msgid "Edit Person Data"
 msgstr "Izmeni lične podatke"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Prikaz imena"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Prezime"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Ime"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Nadimak"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Adresa e-pošte"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2134,12 +2134,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2156,7 +2156,7 @@ msgid "Edit JPilot Entry"
 msgstr "Izmenite JPilot unos"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2349,201 +2349,207 @@ msgstr ""
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi direktorijum..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Obriši direktorijum"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "Isprazni smeće"
+
+#: src/folderview.c:260 src/folderview.c:284
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Šalje odložene poruku/e"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Traži poruke..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prijavi se na _news grupu..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Skloni news _grupu"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Došlo je do greške prilikom slanja poruke %s -u."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2553,26 +2559,26 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2581,12 +2587,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2597,21 +2603,31 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Tema"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Isprazniti sve poruke iz smeća?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2620,34 +2636,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2660,7 +2676,7 @@ msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -2740,120 +2756,120 @@ msgstr "Odaberite datoteku za uvoz"
 msgid "Select importing file"
 msgstr "Odaberite datoteku za uvoz"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Odredite ime adresara i datoteku za uvoz."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Označite i promenite ime LDIF polja za izvoz."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Datoteka uvežena."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Odaberite datoteku."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Ime adresara mora biti navedeno."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Greška pri čitanju LDIF polja."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF datoteka je uspežno uvežena."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Odaberite vCard datoteku"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Ime datoteke"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF polje"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adresar :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Gore"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Dole"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adresar :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Ime datoteke :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Beleške :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Unesi LDIF datoteku u Adresar"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Sled."
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Preth."
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Info datoteke"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF polje"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Gotovo"
 
@@ -3033,7 +3049,7 @@ msgstr "Izlazim"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Primam poruke (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3122,16 +3138,16 @@ msgstr "Unesite lozinku"
 msgid "Protocol log"
 msgstr "Zapis protokola"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adresa]     otvara prozor za pisanje"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3141,73 +3157,73 @@ msgstr ""
 "                         otvara prozor za pisanje sa navedenim datotekama\n"
 "                         dodato"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              prima nove poruke"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          primi sve poruke sa svih naloga"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 šalje sve odložene poruke"
 
-#: src/main.c:582
+#: src/main.c:585
 #, fuzzy
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:583
+#: src/main.c:586
 #, fuzzy
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status               pokazuje ukupan broj poruka"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                debug način"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                debug način"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 prikaž ovu pomoć izađi"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              prikazuje verziju i izlazi"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ili pritisnite `y´ tipku.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Izlazni charset"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3221,19 +3237,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Napisana poruka postoji. Zaista prekinuti?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Odložene poruke"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Neke neposlate poruke su odložene. Izaći odmah?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3241,21 +3257,21 @@ msgstr ""
 "GnuPG nije pravilno instaliran ili je verzija suviše stara.\n"
 "OpenPGP podrška je onemogućena."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "drugi Sylpheed već radi.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Pisanje konfiguracije za akcije...\n"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3625,15 +3641,15 @@ msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Pregled/Iz_vor poruke"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
@@ -3951,8 +3967,8 @@ msgstr "Kreiranje glavnih prozora...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4023,7 +4039,7 @@ msgstr "Sylpheed - Direktorijumi"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/Od_govor"
 
@@ -4042,15 +4058,15 @@ msgstr "/O_dgovori/_pošiljaocu"
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
@@ -4097,22 +4113,22 @@ msgstr "Izlaz iz ovog programa?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Odaberite direktorijum"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Linija za neredbe nije podešena."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Upotreba: %s [OPCIJA]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4129,7 +4145,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4146,15 +4162,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4211,7 +4227,7 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
@@ -4233,7 +4249,7 @@ msgstr "/S_ačuvaj kao"
 msgid "/Save _all..."
 msgstr "/S_ačuvaj kao"
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Štampanje..."
 
@@ -4646,7 +4662,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi sledeće adrese"
 
@@ -4900,7 +4916,7 @@ msgstr "Sintaksna pomoć"
 msgid "Registered actions"
 msgstr "Registrovane akcije"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Novo)"
 
@@ -6331,28 +6347,28 @@ msgstr "Tip"
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Nalog"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Primeni na poddirektorijume"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "koristi i prilikom odovora"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Odvovori-Na:"
 
@@ -6391,19 +6407,19 @@ msgstr "Dodatak"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Datum"
 
@@ -6413,7 +6429,7 @@ msgid "Number"
 msgstr "Broj"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Za:"
@@ -6435,43 +6451,61 @@ msgstr ""
 "Odaberite pojedinosti za prikaz. Možete menjati poredak\n"
 "koristeći Gore / Dolje tipke, ili povlačenjem miša."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Ime šablona"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Unesi"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Zameni "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Simboli "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registrovani šabloni"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Šabloni"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Ime šablona"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Ime šablona"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Šablon"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Greška formata šablona."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Briši šablon"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Zaista želite obrisati ovaj šablon?"
 
@@ -6720,7 +6754,7 @@ msgstr "Filtriranje..."
 msgid "Searching %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6829,7 +6863,7 @@ msgstr "O"
 msgid "%s - POP3 Remote mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Ne."
 
@@ -7396,7 +7430,7 @@ msgstr "Ne mogu pronaći listu news grupa."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Gotovo."
 
@@ -7405,353 +7439,353 @@ msgstr "Gotovo."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d news grupa primljeno (%s pročitano)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/O_dgovori"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/O_dgovori/svim_a"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Premeštanje..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopiranje..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Označi"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Označi/_Označi"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/_Označi/_Ukloni oznaku"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Označi/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Označi/Označi kao _nepročitano"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označi/Označi sve _pročitano"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Postavi kao uobičajeni"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Ponovi i_zmeni"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Napravi pravilo za f_iter"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Napravi pravilo za f_iter/_Automatski"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Napravi pravilo za f_iter/Po _Od"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Napravi pravilo za f_iter/Po _Za"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Napravi pravilo za f_iter/Po _Temi"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Stvaranje pregleda održavanja...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Nema više nepročitanih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Odaberite direktorijum"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Odaberite direktorijum"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
diff --git a/po/sv.po b/po/sv.po
index 57ad1f1b..881c78ac 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -320,7 +320,7 @@ msgstr ""
 "Filen \"%s\" finns redan.\n"
 "Kan inte skapa mapp."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -506,12 +506,12 @@ msgstr "Fann %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Konfigurationen är sparad.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Skräppostfilter"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Skräppostfilter"
 
@@ -656,7 +656,7 @@ msgstr ""
 "program. Om inte, skriv till Free Software Foundation, Inc., 59 Temple Place "
 "- Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -695,7 +695,7 @@ msgstr ""
 "Markera rutorna i `G'-kolumnen för att aktivera meddelandehämtning\n"
 "via \"Hämta alla\""
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -836,8 +836,8 @@ msgstr "Lägg till i adressbok"
 msgid "Address"
 msgstr "Adress"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Kommentarer"
 
@@ -845,34 +845,34 @@ msgstr "Kommentarer"
 msgid "Select Address Book Folder"
 msgstr "Välj adressboksmapp"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Registrerade mallar"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Arkiv"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Arkiv/Ny _bok"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Arkiv/Nytt _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Arkiv/Ny _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Arkiv/Ny _Server"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -880,196 +880,196 @@ msgstr "/_Arkiv/Ny _Server"
 msgid "/_File/---"
 msgstr "/_Arkiv/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Arkiv/_Redigera"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Arkiv/_Ta bort"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Arkiv/_Spara"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Arkiv/St_äng"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Redigera/_Kopiera"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/A_dress"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/A_dress/Ny _adress"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/A_dress/Ny _grupp"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/A_dress/Ny _mapp"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/A_dress/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/A_dress/_Redigera"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_A_dress/_Ta bort"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/V_erktyg"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/V_erktyg/Importera _LDIF-fil"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hjälp/_Om"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Ny _adress"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Ny _grupp"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopiera..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Redigera/Klistra _in"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adressbok"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Mapp"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Sök"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Ta bort"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Lägg till"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Sök"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Stäng"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Ta bort adress(er)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Vill du verkligen ta bort adress(erna)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1079,36 +1079,36 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "_Endast mapp"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Mapp och _adresser"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Vill du verkligen ta bort \"%s\" ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Ny användare, kunde inte spara indexfil."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Ny användare, kunde inte spara adressboksfiler."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Den gamla adressboken är konverterad."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1116,7 +1116,7 @@ msgstr ""
 "Gammal adressbok konverterad,\n"
 "kunde inte spara ny adressindexfil"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1124,7 +1124,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "men skapade nya tomma adressboksfiler."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1132,7 +1132,7 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1140,17 +1140,17 @@ msgstr ""
 "Kunde inte konvertera adressbok,\n"
 "och kunde inte skapa nya adressboksfiler."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1158,75 +1158,75 @@ msgid ""
 "%s%c%s"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adressboksfel"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr "Gammal adressbok konverterad, kunde inte skapa ny adressindexfil"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Kunde inte läsa adressindex"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Fel vid konvertering av adressbok"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adressbokskonvertering"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adressbok"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Person"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "E-postadress"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grupp"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP-server"
 
@@ -1238,11 +1238,11 @@ msgstr "Vanlig adress"
 msgid "Personal address"
 msgstr "Privat adress"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Notera"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Varning"
 
@@ -1289,7 +1289,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ingen"
 
@@ -1305,8 +1305,8 @@ msgstr "/_Lägg till..."
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
@@ -1381,7 +1381,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Visa"
 
@@ -1638,7 +1638,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
@@ -1681,7 +1681,7 @@ msgstr "Sätt automatiskt följande adresser"
 msgid "From:"
 msgstr "Från:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Ämne:"
 
@@ -1831,7 +1831,7 @@ msgstr "MIME-typ"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Storlek"
 
@@ -1962,28 +1962,28 @@ msgstr "Namn och Värde måste anges."
 msgid "Edit Person Data"
 msgstr "Redigera persondata"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Visat namn"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Förnamn"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Smeknamn"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-postadress"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Alias"
 
@@ -2097,12 +2097,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2119,7 +2119,7 @@ msgid "Edit JPilot Entry"
 msgstr "Redigera JPilot-post"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2312,197 +2312,203 @@ msgstr ""
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Skräp"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/_Ny mapp..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/_Byt namn..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Flytta..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Ta bort"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Töm _papperskorgen"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Töm _papperskorgen"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Ta emot nya _meddelanden"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/_Uppdatera mappträd"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "Markera som läst"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Skicka köade meddelanden"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Sök meddelanden..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/_Hämta"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prenumerera på _diskussionsgrupp"
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/T_a bort diskussionsgrupp"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Skapar mappvy...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Olästa"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Ställer in mappinfo...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mappträd"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mappträdet kommer att uppdateras. Fortsätt?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mappträd..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Skräp"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2512,26 +2518,26 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2540,12 +2546,12 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2558,20 +2564,30 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Inte Skräp"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Ta bort alla meddelanden i papperskorgen?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2580,34 +2596,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2620,7 +2636,7 @@ msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -2700,120 +2716,120 @@ msgstr "Välj fil att importera"
 msgid "Select importing file"
 msgstr "Välj fil att importera"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Ange adressboksnamn och fil att importera."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Välj och byt namn på LDIF-fältnamn att importera."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Fil importerad."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Välj en fil."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Adressboksnamn måste anges."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Fel vid inläsning av LDIF-fält."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF-fil importerad."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Välj vCard-fil"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Filnamn"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF-fält"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adressbok:"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Upp"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Ner"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adressbok:"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Filnamn:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Register:"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Importera LDIF-fil till adressboken"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Nästa"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Föregående"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Filinfo"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF-fält"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Avsluta"
 
@@ -2993,7 +3009,7 @@ msgstr "Avslutar"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Tar emot meddelande (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3086,16 +3102,16 @@ msgstr "Skriv in lösenord"
 msgid "Protocol log"
 msgstr "Protokollogg"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adress]    öppna skrivfönster"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3105,23 +3121,23 @@ msgstr ""
 "                         öppna skrivfönster med angivna filer\n"
 "                         bifogade"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive             ta emot nya meddelanden"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all         ta emot nya meddelanden från alla konton"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                skicka alla köade meddelanden"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [mapp]...    visar det totala antalet meddelanden"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3129,48 +3145,48 @@ msgstr ""
 "  --status-full [mapp]...\n"
 "                          visa status för varje mapp"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug               felsökningsläge"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                visa denna hjälp och avsluta"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version             skriv ut versionsinformation och avsluta"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "eller tryck på \"y\"-tangenten.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Filnamn kodning"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3194,19 +3210,19 @@ msgstr ""
 "\n"
 "Fortsätt?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Ett skrivet meddelande finns. Avsluta ändå?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Meddelanden i kö"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Några oskickade meddelanden ligger i kö. Avsluta nu?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3214,20 +3230,20 @@ msgstr ""
 "GnuPG är inte installerad riktigt eller så är versionen för gammal.\n"
 "OpenPGP-stöd avstängt."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "en annan instans av Sylpheed är redan igång.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Migration av konfiguration"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3579,15 +3595,15 @@ msgstr "/_Visa/_Teckenkodning/Kinesisk (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Visa/_Meddelandekällkod"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Visa/_Hela brevhuvudet"
@@ -3894,8 +3910,8 @@ msgstr "Skapar huvudfönster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -3963,7 +3979,7 @@ msgstr "Sylpheed - Mappvy"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
@@ -3979,15 +3995,15 @@ msgstr "/Svara till av_sändaren"
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
@@ -4034,22 +4050,22 @@ msgstr "Avsluta detta program?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Välj mapp"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Kommandorad saknas."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Användning: %s [FLAGGOR]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4066,7 +4082,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4083,15 +4099,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4148,7 +4164,7 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
@@ -4169,7 +4185,7 @@ msgstr "/_Spara som..."
 msgid "/Save _all..."
 msgstr "/Spara -alla..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Skriv _ut"
 
@@ -4571,7 +4587,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Kommandoutdata"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
@@ -4827,7 +4843,7 @@ msgstr " Syntaxhjälp "
 msgid "Registered actions"
 msgstr "Registrerade åtgärder"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Ny)"
 
@@ -6211,28 +6227,28 @@ msgstr "Typ"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Visa inte [...] eller (...) i början av ärendet i summering"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Ta bort [...] eller (...) i början av ärendet vid svar"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Konto"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Gäller även undermappar"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "använd också vid svar"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Svara till:"
 
@@ -6270,19 +6286,19 @@ msgstr "Bilaga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Datum"
 
@@ -6292,7 +6308,7 @@ msgid "Number"
 msgstr "Nummer"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Till:"
@@ -6315,43 +6331,61 @@ msgstr ""
 "genom att använda \"Upp\"- och \"Ner\"-knapparna eller genom att dra "
 "posterna. "
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Mallnamn"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Registrera"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Byt ut "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Symboler "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Registrerade mallar"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Mallar"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Mallnamn"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Mallnamn"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Mall"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Mallformatfel"
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Ta bort mall"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Vill du verkligen ta bort denna mall?"
 
@@ -6600,7 +6634,7 @@ msgstr "Filtrerar..."
 msgid "Searching %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
@@ -6708,7 +6742,7 @@ msgstr "Om"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Nr."
 
@@ -7277,7 +7311,7 @@ msgstr "Kan inte hämta grupplista."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan inte hämta grupplista."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Färdig."
 
@@ -7286,349 +7320,349 @@ msgstr "Färdig."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d diskussionsgrupper mottagna (%s lästa)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Svar_a till"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/_Svara till/_alla"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/_Svara till/av_sändaren"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/_Svara till/e-post_lista"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Flytta..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopiera..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/_Markera"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/_Markera/_Markera"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "_Markera/_Avmarkera"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/_Markera/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markera/Markera som _oläst"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markera/Markera som _läst"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/_Markera/Markera som _läst"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markera/Markera alla som l_ästa"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/F_ärgmarkera"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Sätt som skräppost"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Sätt som skräppost"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/Redigera _om"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/_Lägg till avsändaren till adressboken"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/_Skapa filterregel"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Skapa filterregel/_Automatiskt"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Skapa filterregel/genom _Från"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Skapa filterregel/genom _Till"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Skapa filterregel/genom _Ämne"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Skapar summeringsvy...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Söker igenom mapp (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Behandla markering"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Några markeringar finns kvar. Behandla dem?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Söker igenom mapp (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Sök igen"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Inga färgade meddelanden."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d olästa, %d totalt (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d olästa, %d totalt"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Välj mapp"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Välj mapp"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
diff --git a/po/tr.po b/po/tr.po
index 3c259658..efc044b6 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-02-20 16:54+0200\n"
 "Last-Translator: Doruk Fisek <dfisek@fisek.com.tr>\n"
 "Language-Team: Turkish <gnu-tr-u12a@lists.sourceforge.net>\n"
@@ -331,7 +331,7 @@ msgstr ""
 "%s dosyası zaten bulunuyor.\n"
 "Dizin oluşturulamadı."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -510,12 +510,12 @@ msgstr "%s bulundu\n"
 msgid "Configuration is saved.\n"
 msgstr "Yapılandırma kaydedildi.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "dizin:"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "dizin:"
@@ -657,7 +657,7 @@ msgstr ""
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA adresine konuyla ilgili "
 "yazınız."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -696,7 +696,7 @@ msgstr ""
 "kutucukları tıklanarak bu hesaplar için `Hepsini al' seçeneğini \n"
 "etkin duruma getirilebilir."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -839,8 +839,8 @@ msgstr "Adres Defterine Ekle"
 msgid "Address"
 msgstr "Adres"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Notlar"
 
@@ -848,34 +848,34 @@ msgstr "Notlar"
 msgid "Select Address Book Folder"
 msgstr "Adres Defteri Dizinini Seç"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Kayıtlı şablonlar"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Dosya"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Dosya/Yeni _Defter"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Dosya/Yeni _vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Dosya/Yeni _JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/_Dosya/Yeni _Sunucu"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -883,196 +883,196 @@ msgstr "/_Dosya/Yeni _Sunucu"
 msgid "/_File/---"
 msgstr "/_Dosya/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Dosya/_Düzenle"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Dosya/_Sil"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Dosya/_Kaydet"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Dosya/K_apat"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Dü_zenle/K_opyala"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/_Adres"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/_Adres/Yeni _Adres"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/_Adres/Yeni _Grup"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/_Adres/Yeni _Dizin"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/_Adres/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/_Adres/Dü_zenle"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/_Adres/_Sil"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/A_raçlar"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/A_raçlar/_LDIF dosyasını ekle"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Yardım"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Yardım/_Hakkında"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Yeni _Adres"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Yeni _Grup"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Sil"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Kopyala..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/Dü_zenle/_Yapıştır"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Adres defteri"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Dizin"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "İleti adresi"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "Ara"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Sil"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Ekle"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Ara"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Kapat"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Adres(ler)i sil"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Adres(ler) silinsin mi?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1082,38 +1082,38 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Dizini sil"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "Sadece dizin"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "Dizin ve Adresler"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "`%s' silinsin mi?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Yeni kullanıcı, indeks dosyası kaydedilemedi."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Yeni kullanıcı, adres defteri dosyaları kaydedilemedi."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Eski adres defteri başarıyla çevrildi."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1121,7 +1121,7 @@ msgstr ""
 "Eski adres defteri çevrildi,\n"
 "yeni adres indeks dosyası kaydedilemedi"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1129,7 +1129,7 @@ msgstr ""
 "Adres defteri çevrilemedi,\n"
 "ancak boş bir adres defteri dosyası oluşturuldu."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1137,7 +1137,7 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1145,17 +1145,17 @@ msgstr ""
 "Adres defteri ve yeni adres defteri \n"
 "dosyası oluşturulamadı."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Adres defteri çevrim hatası"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Adres defteri çevrimi"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1163,78 +1163,78 @@ msgid ""
 "%s%c%s"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Adres Defteri Hatası"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Adres indeksi okunamadı"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Adres Defteri Çevrim Hatası"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Adres Defteri Çevrimi"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Arayüz"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Adres Defteri"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Kişi"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "İleti Adresi"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Grup"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP Sunucu"
 
@@ -1246,11 +1246,11 @@ msgstr "Ortak adres"
 msgid "Personal address"
 msgstr "Kişisel adres"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Not"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Uyarı"
 
@@ -1297,7 +1297,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1313,8 +1313,8 @@ msgstr "/_Ekle..."
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
@@ -1389,7 +1389,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Görünüm"
 
@@ -1670,7 +1670,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
@@ -1714,7 +1714,7 @@ msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 msgid "From:"
 msgstr "Kimden:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Konu:"
 
@@ -1871,7 +1871,7 @@ msgstr "MIME türü"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Boyut"
 
@@ -2003,28 +2003,28 @@ msgstr "Bir isim ve değer girilmelidir."
 msgid "Edit Person Data"
 msgstr "Kişi Verilerini Düzenle"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Görüntülenecek İsim"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Soyadı"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Adı"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Lakabı"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-posta Adresi"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Takma isim"
 
@@ -2139,12 +2139,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2161,7 +2161,7 @@ msgid "Edit JPilot Entry"
 msgstr "JPilot Girdisini Düzenle"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2354,198 +2354,204 @@ msgstr ""
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Gereksiz"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Yeni _dizin yarat..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/D_izinin adını değiştir"
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/D_izinin adını değiştir"
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Dizini _sil"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Çö_pü boşalt"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Çö_pü boşalt"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Y_eni iletileri al"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Dizin ağacını _yeniden yarat"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "Okunmuş olarak işaretle"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/İ_letilerda ara..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/İ_ndir"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Haber grubuna üye ol..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/H_aber grubunu sil"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Dizin görüntüsü oluşturuluyor...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Toplam"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlanıyor...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden tara"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin ağacı yeniden oluşturulacak. Devam edilsin mi?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden yaratılıyor..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin ağacı yeniden oluşturulamadı."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Gereksiz"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2555,26 +2561,26 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2583,12 +2589,12 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2599,21 +2605,31 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Konu"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Çöpteki tüm iletiler silinsin mi?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2622,34 +2638,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2662,7 +2678,7 @@ msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -2742,120 +2758,120 @@ msgstr "Eklenecek dosyayı seçin"
 msgid "Select importing file"
 msgstr "Eklenecek dosyayı seçin"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Lütfen adres defteri adını ve aktarılacak dosyası seçin."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Aktarılacak dosyaların adlarını LDIF alanlarından seçiniz"
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Dosya aktarıldı."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Lütfen bir dosya seçin."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Adres defteri adı verilmelidir."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "LDIF alanları okunurken hata."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "Eski adres defteri başarıyla dışarıdan aktarıldı."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "vCard Dosyasını Seç"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Dosya Adı"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Virgüller ayrılmış"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Tab ile ayrılmış"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF Alanı"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Adres Defteri :"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Yukarı"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Aşağı"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Adres Defteri :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Dosya Adı :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Kayıtlar :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "LDIF dosyasını Adres Defterine aktar"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Sonraki"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Önceki"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Dosya Bilgisi"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF Alanı"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Bitir"
 
@@ -3035,7 +3051,7 @@ msgstr "Çıkılıyor"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "İletiler alınıyor (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3130,16 +3146,16 @@ msgstr "Parolayı girin"
 msgid "Protocol log"
 msgstr "Protokol günlüğü"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [adres]    düzenleme penceresini açar"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3149,23 +3165,23 @@ msgstr ""
 "                         düzenleme penceresini belirtilen dosyalar\n"
 "                         postaya eklenmiş halde açar"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive               yeni mesajları alır"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          tüm hesaplardaki yeni mesajları alır"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 kuyruktaki postaları gönderir"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [dizin]...   toplam mesaj sayısını göster"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3173,49 +3189,49 @@ msgstr ""
 "  --status-full [dizin]...\n"
 "                         her dizinin durumunu göster"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                hata ayıklama modu"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 bu yardımı gösterir ve çıkar"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              sürüm bilgisini gösterir ve çıkar"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "ya da `y' tuşuna basın.\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "Giden ileti kod kümesi"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3229,19 +3245,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Mesajı göndermeden çıkmak istediğinizden emin misiniz?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Kuyruktaki iletiler"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Hala gönderilmemiş bazı iletiler kuyrukta bekliyor. Şimdi çıkılsın mı?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3249,21 +3265,21 @@ msgstr ""
 "GnuPG düzgün kurulmamış veya versiyonu çok eski\n"
 "OpenPGP desteği kapatıldı."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Eklentiler yükleniyor..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "Başka bir Sylpheed sistemde çalışıyor.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 #, fuzzy
 msgid "Migration of configuration"
 msgstr "Eylem ayarları"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3626,15 +3642,15 @@ msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Görünüm/İ_leti kaynağı"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Görünüm/Tüm _başlıklar"
@@ -3945,8 +3961,8 @@ msgstr "Yeni pencere oluşturuluyor...\n"
 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:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -4016,7 +4032,7 @@ msgstr "Sylheed - Dizin Görünümü"
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
@@ -4032,15 +4048,15 @@ msgstr "/_Gönderene yanıtla"
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
@@ -4087,22 +4103,22 @@ msgstr "Programdan çıkılsın mı?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Dizini seç"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "Komut satırı belirtilmedi."
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Kullanım: %s [SEÇENEKLER] ...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4119,7 +4135,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4136,15 +4152,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4201,7 +4217,7 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
@@ -4223,7 +4239,7 @@ msgstr "/_Farklı kaydet..."
 msgid "/Save _all..."
 msgstr "/_Farklı kaydet..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/_Yazdır...."
 
@@ -4635,7 +4651,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
@@ -4893,7 +4909,7 @@ msgstr " Yazım Yardımı"
 msgid "Registered actions"
 msgstr "Kayıtlı eylemler"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Yeni)"
 
@@ -6293,28 +6309,28 @@ msgstr "Tür"
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Özette başlığında başında [...] veya (...) gösterme"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Cevaplarken başlığın başındaki [...] veya (...) işaretlerini sil"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Hesap"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Alt dizinlere uygula"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "ayrıca yanıtlarken kullan"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Yanıtla:"
 
@@ -6350,19 +6366,19 @@ msgstr "Ek"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Tarih"
 
@@ -6372,7 +6388,7 @@ msgid "Number"
 msgstr "Numara"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Kime"
 
@@ -6392,43 +6408,61 @@ msgstr ""
 "Özet görünümde gösterilecek nesneleri seçiniz. Ayrıca Yukarı/Aşağı\n"
 "tuşlarını kullanarak bu nesneleri sıralamasını değiştirebilirsiniz."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Şablon adı"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Kaydol"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Değiştir "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Semboller "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Kayıtlı şablonlar"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Şablonlar"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Şablon adı"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Şablon adı"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Şablon"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Şablon biçim hatası."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Şablonu sil"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Gerçekten bu şablonu silmek istiyor musunuz?"
 
@@ -6672,7 +6706,7 @@ msgstr "Arıyor %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Arıyor %s..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
@@ -6775,7 +6809,7 @@ msgstr "_Hakkında"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - POP3 Uzak posta kutusu"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Hayır."
 
@@ -7350,7 +7384,7 @@ msgstr "Haber grubu listesi alınamadı."
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi alınamadı."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Tamamlandı."
 
@@ -7359,356 +7393,356 @@ msgstr "Tamamlandı."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d haber grubu alındı (%s okundu)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/_Başkasına yanıtla"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/_Başkasına yanıtla/_herkese"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/_Başkasına yanıtla/_gönderene"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/_Başkasına yanıtla/posta _listesine"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/T_aşı..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Kopyala..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/İşa_retle"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/İşa_retle/_İşaretle"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/İşa_retle/_İşareti Kaldır"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/İşa_retle/--- "
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/İşa_retle/Okun_mamış olarak işaretle"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/İşa_retle/_Okunmuş olarak işaretle"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/İşa_retle/_Okunmuş olarak işaretle"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/İşa_retle/H_epsini okunmuş olarak işaretle"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/_Renk etiketi"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Öntanımlı kullan"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/_Yeniden düzenle"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Göndericiyi adres defterine ekle"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Alıcıya göre oluştur"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Özet oluşturuluyor...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Dizin taranıyor (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Süreç işareti"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Bazı işaretler bırakılmış. İşlemeye devam edilsin mi?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Dizin taranıyor (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "IMAP4 oturumuna %s:%d ile bağlantı kurulamadı\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Başka okunmamış ileti yok"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Okunmamış ileti yok."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Okunamamış ileti yok. Diğer dizine geçilsin mi?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Başka ileti yok"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren aransın mı?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Yeni ileti yok. Sonraki dizine geçilsin mi?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Başka işaretlenmiş posta yok"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "İşaretlenmiş ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "İşaretlenmiş ileti yok."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "İşaretlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Başka etiketlenlenmiş ileti yok. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Başka etiketlenmiş ileti yok."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Konularına göre postalar çekiliyor..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d taşındı"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyalandı"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " öğe seçildi"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmamış, toplam %d (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmamış, toplam %d"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Taşınacak dizini seç"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Dizini seç"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
diff --git a/po/uk.po b/po/uk.po
index cdaf6029..230ea10d 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 3.0.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2010-03-01 22:30+0300\n"
 "Last-Translator: O.R. Nykyforchyn <oleh.nyk@gmail.com>\n"
 "Language-Team: Ukrainian\n"
@@ -324,7 +324,7 @@ msgstr ""
 "Файл `%s' вже існує.\n"
 "Неможливо створити папку."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -511,11 +511,11 @@ msgstr "Знайдено %s\n"
 msgid "Configuration is saved.\n"
 msgstr "Конфігурацію збережено.\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 msgid "Junk mail filter (manual)"
 msgstr "Фільтр мотлоху (вручну)"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "фільтр мотлоху"
 
@@ -659,7 +659,7 @@ msgstr ""
 "програмою; якщо це не так, пишіть у Free Software Foundation, Inc., 59 "
 "Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -695,7 +695,7 @@ msgstr ""
 "Порядок перевірки нових листів. Позначте в колонці `G'\n"
 "account'и, які поповнюються через `Отримати всі'."
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -836,8 +836,8 @@ msgstr "Додати адресу до книги"
 msgid "Address"
 msgstr "Адреса"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Нотатки"
 
@@ -845,32 +845,32 @@ msgstr "Нотатки"
 msgid "Select Address Book Folder"
 msgstr "Обрати папку адресної книги"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 msgid "Auto-registered address"
 msgstr "Адреса, зареєстрована автоматично"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/Файл"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/Файл/Нова книга"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/Файл/Нова vCard"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/Файл/Новий JPilot"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/Файл/Новий сервер LDAP"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -878,190 +878,190 @@ msgstr "/Файл/Новий сервер LDAP"
 msgid "/_File/---"
 msgstr "/Файл/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/Файл/Редагувати"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/Файл/Видалити"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/Файл/Зберегти"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/Файл/Закрити"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/Редагувати/Копіювати"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/Редагувати/Вставити"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/Адреса"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/Адреса/Нова адреса"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/Адреса/Нова група"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/Адреса/Нова папка"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/Адреса/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/Адреса/Редагувати"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/Адреса/Видалити"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/Інструменти"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/Інструменти/Імпортувати файл LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 msgid "/_Tools/Import _CSV file"
 msgstr "/Інструменти/Імпортувати файл CSV"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/Допомога"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/Допомога/Про програму"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Нова адреса"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/Нова група"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Нова папка"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/Видалити"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 msgid "/_Copy"
 msgstr "/Копіювати"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 msgid "/_Paste"
 msgstr "/Вставити"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Адресна книга"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Папка"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Пошук:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Приховано:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Видалити"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Додати"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 msgid "Search"
 msgstr "Пошук"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 msgid "_Close"
 msgstr "Закрити"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Видалити адресу(и)"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Дійсно видалити адресу(и)?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1070,36 +1070,36 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Видалити папку"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "Тільки папку"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Папку та адреси"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Дійсно видалити `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "Новий користувач, не вдалось зберегти покажчик."
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "Новий користувач, не вдалось зберегти адресну книгу."
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Стару адресну книгу успішно конвертовано."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1107,7 +1107,7 @@ msgstr ""
 "Стару адресну книгу конвертовано,\n"
 "не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1115,7 +1115,7 @@ msgstr ""
 "Не вдалось конвертувати адресну книгу,\n"
 "але створено нову (порожню)."
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1123,7 +1123,7 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1131,15 +1131,15 @@ msgstr ""
 "Не вдалось ні конвертувати адресну книгу,\n"
 "ні створити нові файли адресної книги."
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 msgid "Address book conversion error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 msgid "Address book conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1150,71 +1150,71 @@ msgstr ""
 "\n"
 "%s%c%s"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 msgid "Address Book Error"
 msgstr "Помилка в адресній книзі"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr ""
 "Стару адресну книгу конвертовано, не вдалось зберегти новий покажчик адрес"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "Не вдалось конвертувати адресну книгу, але створено нову (порожню)."
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "Не вдалось ні конвертувати адресну книгу, ні створити нову."
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Не вдалось прочитати покажчик адрес"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 msgid "Address Book Conversion Error"
 msgstr "Помилка при конвертуванні адресної книги"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 msgid "Address Book Conversion"
 msgstr "Конвертування адресної книги"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Інтерфейс"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Адресна книга"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Особа"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Адреса e-mail"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Група"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Сервер LDAP"
 
@@ -1226,11 +1226,11 @@ msgstr "Адреса організації"
 msgid "Personal address"
 msgstr "Особиста адреса"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Примітка"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Попередження"
 
@@ -1277,7 +1277,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Ніякий"
 
@@ -1293,8 +1293,8 @@ msgstr "/Додати..."
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
@@ -1368,7 +1368,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/Вигляд"
 
@@ -1617,7 +1617,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
@@ -1658,7 +1658,7 @@ msgstr "Дійсно послати цю пошту на наступні адр
 msgid "From:"
 msgstr "Від:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Тема:"
 
@@ -1808,7 +1808,7 @@ msgstr "тип MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Розмір"
 
@@ -1938,28 +1938,28 @@ msgstr "Потрібно надати ім'я та значення."
 msgid "Edit Person Data"
 msgstr "Редагувати особисті дані"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Ім'я для списку"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Прізвище"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Ім'я"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Прізвисько"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Адреса e-mail"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Синонім"
 
@@ -2071,12 +2071,12 @@ msgstr "Редагувати папку"
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2093,7 +2093,7 @@ msgid "Edit JPilot Entry"
 msgstr "Редагувати запис JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2276,193 +2276,199 @@ msgstr "Файл вже існує. Замінити новим?"
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Мотлох"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Створити нову папку..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Перейменувати папку..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/Перенести папку..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/Видалити папку"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Спорожнити кошик"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Спорожнити кошик"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/Перевірити за новими листами"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/Перебудувати дерево папок"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/Оновити список"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 msgid "/Mar_k all read"
 msgstr "/Позначити як прочитане"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 msgid "/Send _queued messages"
 msgstr "/Відіслати лист(и) з черги"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/Шукати листи..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr "/Редагувати умови пошуку..."
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Завантажити"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Передплатити конференцію"
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/Видалити конференцію"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Створення області перегляду папок...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Нові"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Непрочитані"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr "Загалом"
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Встановлюємо інформацію папки...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Перебудувати дерево папок"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок буде перебудовано. Продовжити?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Перебудовуємо дерево папок..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Не вдалось перебудувати дерево папок."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Мотлох"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Завантажити всі листи у '%s' ?"
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 msgid "Download all messages"
 msgstr "Завантажити всі листи"
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2472,26 +2478,26 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не вдалось перейменувати папку `%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2500,11 +2506,11 @@ msgstr ""
 "Справді видалити папку пошуку `%s' ?\n"
 "(Листи НЕ видаляються з диска.)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Видалити папку пошуку"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2517,20 +2523,30 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Не мотлох"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Видалити всі листи з кошика?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2539,34 +2555,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -2579,7 +2595,7 @@ msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Без відправника)"
 
@@ -2648,112 +2664,112 @@ msgstr "Обрати імпортовану папку"
 msgid "Select importing file"
 msgstr "Обрати імпортований файл"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Вкажіть, будь-ласка, назву адресної книги і імпортований файл."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 msgid "Select and reorder CSV field names to import."
 msgstr "Виберіть і перевпорядкуйте поля CSV для імпорту."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Файл імпортовано."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Оберіть, будь-ласка, файл."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Потрібно вказати назву адресної книги."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 msgid "Error reading CSV fields."
 msgstr "Помилка при читанні полів CSV."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 msgid "CSV file imported successfully."
 msgstr "Успішно імпортовано файл CSV."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 msgid "Select CSV File"
 msgstr "Оберіть файл CSV"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Назва файла"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr "Відокремлено комами"
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr "Відокремлено табуляціями"
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 msgid "CSV Field"
 msgstr "Поле CSV"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 msgid "Address Book Field"
 msgstr "Поле адресної книги"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr "Змінити порядок полів адресної книги кнопками Up і Down."
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Вгору"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Вниз"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Адресна книга :"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Назва файла :"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Записи :"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 msgid "Import CSV file into Address Book"
 msgstr "Імпортувати файл LDIF в адресну книгу"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Далі"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Назад"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Інформація про файл"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 msgid "Fields"
 msgstr "Поля"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Закінчити"
 
@@ -2931,7 +2947,7 @@ msgstr "Виходимо"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Отримуємо лист (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3026,16 +3042,16 @@ msgstr "Введіть пароль"
 msgid "Protocol log"
 msgstr "Журнал протоколу"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Вживання: %s [ОПЦІЇ]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    відкрити вікно для нового листа"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3045,23 +3061,23 @@ msgstr ""
 "                         відкрити вікно створення з приєднанням вказаних\n"
 "                         файлів"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              отримати нові листи"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          отримати нові листи для всіх записів"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 відіслати всі відкладені листи"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [folder]...   показати загальну кількість листів"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3069,45 +3085,45 @@ msgstr ""
 "  --status-full [folder]...\n"
 "                         показати стан кожної папки"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr "  --open folderid/msgnum відкрити лист у новому вікні"
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr "  --configdir ім'я папки     вказати папку для файлів налаштувань"
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr "  --ipcport portnum      вказати порт для віддалених команд IPC"
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                 вийти з Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                режим відлагодження"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 показати цю довідку і вийти"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              видати інформацію про версію і вийти"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr "Натисніть яку-небудь кнопку..."
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Кодова таблиця для імен файлів"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3131,19 +3147,19 @@ msgstr ""
 "\n"
 "Продовжити?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Є незавершені листи. Справді вийти?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Листи в черзі"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Деякі невідіслані листи - в черзі. Вийти зараз?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3151,20 +3167,20 @@ msgstr ""
 "GnuPG не встановлено належно, або надто стара версія.\n"
 "Відключено підтримку OpenPGP."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr "Завантажуємо плагіни..."
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "вже запущено інший Sylpheed.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Перенесення налаштувань"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3506,15 +3522,15 @@ msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/Вигляд/Вихідний текст листа"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 msgid "/_View/All _headers"
 msgstr "/Вигляд/Весь заголовок"
 
@@ -3813,8 +3829,8 @@ msgstr "Створюємо головне вікно...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "виконано.\n"
 
@@ -3883,7 +3899,7 @@ msgstr "Sylpheed - Папки"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/Відповісти"
 
@@ -3899,15 +3915,15 @@ msgstr "/Відповісти відправникові"
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
@@ -3951,19 +3967,19 @@ msgstr "Вийти з цієї програми?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 msgid "Select folder to open"
 msgstr "Обрати папку для відкриття"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Опції командного рядка"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Вживання: sylpheed [ОПЦІЇ]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -3993,7 +4009,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4023,15 +4039,15 @@ msgstr ""
 "показати цю довідку і вийти\n"
 "показати інформацію про версію і вийти"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 #, fuzzy
 msgid "specify port for IPC remote commands"
 msgstr "  --ipcport portnum      вказати порт для віддалених команд IPC"
@@ -4089,7 +4105,7 @@ msgstr "Вкладення"
 msgid "Message View - Sylpheed"
 msgstr "Зміст листа - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
@@ -4110,7 +4126,7 @@ msgstr "/Зберегти як..."
 msgid "/Save _all..."
 msgstr "/Зберегти все..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/Друк..."
 
@@ -4500,7 +4516,7 @@ msgstr "Прямий ввід "
 msgid "Command output"
 msgstr "Вивід команди"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Автоматично встановлювати наступні адреси"
 
@@ -4752,7 +4768,7 @@ msgstr "Синтаксична довідка"
 msgid "Registered actions"
 msgstr "Зареєстровані дії"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(Новий)"
 
@@ -6103,28 +6119,28 @@ msgstr "Тип"
 msgid "Normal"
 msgstr "Нормальний"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Не показувати [...] чи (...) на початку теми у списку"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Видаляти [...] чи (...) на початку теми при відповіді"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Обліковий запис"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Застосувати до підпапок"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "вживати і при відповіді"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Зворотня:"
 
@@ -6160,19 +6176,19 @@ msgstr "Вкладення"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Дата"
 
@@ -6182,7 +6198,7 @@ msgid "Number"
 msgstr "Номер"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 msgid "To"
 msgstr "Кому:"
 
@@ -6202,43 +6218,61 @@ msgstr ""
 "Оберіть поля, які буде показано при відображенні списка. Ви можете\n"
 "змінити їх порядок з допомогою кнопок Вгору / Вниз."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Назва шаблону"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Реєструвати"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Підставити "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Символи "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Зареєстровані шаблони"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Шаблони"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Назва шаблону"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Назва шаблону"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Шаблон"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Помилка формату шаблону."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Видалити шаблон"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Справді видалити цей шаблон?"
 
@@ -6472,7 +6506,7 @@ msgstr "Шукаємо %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Шукаємо %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Без дати)"
 
@@ -6569,7 +6603,7 @@ msgstr "Про програму"
 msgid "%s - POP3 Remote mailbox"
 msgstr "%s - віддалена POP3-скринька"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Номер"
 
@@ -7128,7 +7162,7 @@ msgstr "Отримання списку конференцій..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Не вдалось отримати список конференцій"
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Виконано."
 
@@ -7137,344 +7171,344 @@ msgstr "Виконано."
 msgid "%d newsgroups received (%s read)"
 msgstr "%d конференцій отримано (%s прочитано)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Відповісти"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Відповісти/всім"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Відповісти/відправникові"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Відповісти/конференції"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "Перемістити"
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/Копіювати"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Позначити"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/Позначити/Позначити"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/Позначити/Зняти виділення"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/Позначити/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Позначити/Позначити як непрочитане"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Позначити/Позначити як прочитане"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/Позначити/Позначити нитку як прочитану"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/Позначити/Позначити все як прочитане"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/Кольорова позначка"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 msgid "/Set as _junk mail"
 msgstr "/Вважати мотлохом"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 msgid "/Set as not j_unk mail"
 msgstr "/Вважати не мотлохом"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "Змінити"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/Додати відправника до адресної книги"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Створити правило фільтрування"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Створити правило фільтрування/Автоматично"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Створити правило фільтрування/За полем `Від'"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Створити правило фільтрування/За полем `Кому'"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "//Створити правило фільтрування/За полем `Тема'"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Створюємо область перегляду списка...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Перечитуємо папку (%s) (%d)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Обробка позначок"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Залишились деякі позначки. Опрацювати?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Перечитуємо папку (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Не вдалось встановити з'єднання IMAP.\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "Шукати знову"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Більше немає непрочитаних листів"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Не знайдено непрочитаних листів. Шукати з кінця?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Немає непрочитаних листів"
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Не знайдено непрочитаних листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Більше немає нових листів"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Не знайдено нових листів. Шукати з кінця?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Немає нових листів"
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Не знайдено нових листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Більше немає позначених листів"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Не знайдено позначених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Немає позначених листів."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не знайдено позначених листів. Шукати з початку?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Більше немає виділених листів"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Не знайдено виділених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Немає виділених листів"
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не знайдено виділених листів. Шукати з початку?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Групування листів за темами..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d видалено"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d переміщено"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопійовано"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " записів обрано"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нових, %d непрочитаних, %d загалом (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нових, %d непрочитаних, %d загалом"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Сортуємо список..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tФормуємо список з даних листів..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 msgid "Select folder to move"
 msgstr "Обрати папку для перенесення"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 msgid "Select folder to copy"
 msgstr "Обрати папку для копіювання"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
diff --git a/po/vi.po b/po/vi.po
index 363506bd..49867230 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -318,7 +318,7 @@ msgstr ""
 "Tập tin `%s' đã có trước.\n"
 "Không thể tạo thư mục."
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -504,12 +504,12 @@ 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:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "Lọc thư rác"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "Lọc thư rác"
 
@@ -639,7 +639,7 @@ msgid ""
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -677,7 +677,7 @@ 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:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -818,8 +818,8 @@ msgstr "Thêm địa chỉ vào sổ"
 msgid "Address"
 msgstr "Địa chỉ"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "Ghi chú"
 
@@ -827,33 +827,33 @@ msgstr "Ghi chú"
 msgid "Select Address Book Folder"
 msgstr "Chọn thư mục sổ địa chỉ"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "Các mẫu đã đăng kí"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/_Tập tin"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/_Tập tin/_Sổ mới"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/_Tập tin/_vCard mới"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/_Tập tin/_JPilot mới"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 msgid "/_File/New _LDAP Server"
 msgstr "/_Tập tin/_Máy chủ LDAP mới"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -861,195 +861,195 @@ msgstr "/_Tập tin/_Máy chủ LDAP mới"
 msgid "/_File/---"
 msgstr "/_Tập tin/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/_Tập tin/Soạ_n"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/_Tập tin/_Xoá"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/_Tập tin/_Lưu"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/_Tập tin/Đón_g"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/_Soạn/_Sao chép"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/Đị_a chỉ"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/Đị_a chỉ/Địa chỉ _mới"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/Đị_a chỉ/_Nhóm mới"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/Đị_a chỉ/_Thư mục mới"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/Đị_a chỉ/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/Đị_a chỉ/_Soạn"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/Đị_a chỉ/_Xoá"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/_Công cụ"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/_Công cụ/_Nhập tập tin LDIF"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/_Hỗ trợ"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/_Hỗ trợ/_Giới thiệu"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/Địa chỉ _mới"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/_Nhóm mới"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/_Xoá"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/_Sao chép"
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/_Soạn/_Dán"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "Sổ địa chỉ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "Thư mục"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 msgid "Search:"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "Bcc:"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "Xoá"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "Thêm"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "Tìm kiếm:"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "Màu sắc"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "Xoá địa chỉ"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "Thực sự muốn xoá (các) địa chỉ này?"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1058,36 +1058,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:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "_Chỉ thư mục"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "Thư mục và địa c_hỉ"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "Thực sự muốn xoá `%s' ?"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 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:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 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:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "Sổ địa chỉ cũ đã được chuyển đổi thành công."
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1095,7 +1095,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:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1103,7 +1103,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:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1111,7 +1111,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:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1119,17 +1119,17 @@ 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:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1137,78 +1137,78 @@ msgid ""
 "%s%c%s"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "Lỗi sổ địa chỉ"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 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:2999
+#: src/addressbook.c:3364
 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:3005
+#: src/addressbook.c:3370
 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:3011
+#: src/addressbook.c:3376
 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:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "Không thể đọc mục lục địa chỉ"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "Lỗi chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "Chuyển đổi sổ địa chỉ"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "Giao diện"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "Sổ địa chỉ"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "Cá nhân"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "Địa chỉ email"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "Nhóm"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "Máy chủ LDAP"
 
@@ -1220,11 +1220,11 @@ msgstr "Địa chỉ chung"
 msgid "Personal address"
 msgstr "Địa chỉ cá nhân"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "Chú ý"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "Cảnh báo"
 
@@ -1271,7 +1271,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "Không"
 
@@ -1287,8 +1287,8 @@ msgstr "/Thê_m..."
 msgid "/_Remove"
 msgstr "/_Xoá bỏ"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/Th_uộc tính"
 
@@ -1362,7 +1362,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Soạn/Tự độ_ng khuôn dòng"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/_Xem"
 
@@ -1615,7 +1615,7 @@ 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:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
@@ -1658,7 +1658,7 @@ msgstr "Tự động đặt địa chỉ sau"
 msgid "From:"
 msgstr "Người gửi:"
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "Tiêu đề:"
 
@@ -1807,7 +1807,7 @@ msgstr "Kiểu MIME"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "Kích thước"
 
@@ -1936,28 +1936,28 @@ msgstr "Phải cung cấp một Tên và Giá trị."
 msgid "Edit Person Data"
 msgstr "Soạn dữ liệu về cá nhân"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "Tên hiển thị"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "Họ"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "Tên"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "Biệt danh"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "Địa chỉ email"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "Bí danh"
 
@@ -2071,12 +2071,12 @@ msgstr "Sửa thư mục"
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2093,7 +2093,7 @@ msgid "Edit JPilot Entry"
 msgstr "Soạn mục JPilot"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2286,196 +2286,202 @@ msgstr ""
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Hộp nhận"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Đã gửi"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Đợi gửi"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Thùng rác"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nháp"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "Rác"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "Thư mục mới"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' không được có trong tên thư mục."
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Không tạo được thư mục `%s'."
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/Tạo thư mục _mới..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/Đổi _tên thư mục..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/_Di chuyển thư mục..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/_Xoá thư mục"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/Đổ _rác"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/Đổ _rác"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/_Kiểm tra thư mới"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/_Làm lại cây thư mục"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 msgid "/_Update summary"
 msgstr "/_Cập nhật tóm tắt"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "Đánh dấu là đã đọc"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "_Gửi thư đang đợi"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/_Tìm thư..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/Tải _về"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Đăng kí vào _nhóm tin..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/_Xoá nhóm tin"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "Đang tạo khung thư mục...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "Mới"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "Chưa đọc"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "Thiết lập thông tin thư mục...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "Làm lại cây thư mục"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Cây thư mục sẽ được làm lại. Tiếp tục?"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "Đang làm lại cây thư mục..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "Việc làm lại cây thư mục thất bại."
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "Rác"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Thư mục %s được chọn\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Có lỗi khi tải thư về trong `%s'."
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2485,26 +2491,26 @@ msgstr ""
 "(nếu bạn muốn tạo một thư mục để lưu thư mục con,\n"
 " thêm `/' vào cuối tên)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Đặt tên cho `%s':"
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Không thể đổi tên thư mục `%s'."
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2513,11 +2519,11 @@ msgstr ""
 "Xoá thư mục tìm kiếm `%s' ?\n"
 "Thư sẽ không bị xoá khỏi ổ cứng."
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 msgid "Delete search folder"
 msgstr "Xoá thư mục tìm kiếm"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2530,20 +2536,30 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục '%s'."
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "Không phải thư rác"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "Xoá mọi thư trong thùng rác?"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2552,34 +2568,34 @@ msgstr ""
 "Thực sự muốn xoá hộp thư `%s' ?\n"
 "(Thư sẽ KHÔNG bị xoá khỏi ổ cứng)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản tin tức `%s'?"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -2592,7 +2608,7 @@ msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -2672,120 +2688,120 @@ msgstr "Chọn tập tin nhập khẩu"
 msgid "Select importing file"
 msgstr "Chọn tập tin nhập khẩu"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "Hãy chỉ định tên sổ địa chỉ và tập tin để nhập khẩu."
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "Chọn và đổi tên các trường LDIF để nhập khẩu."
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "Tập tin đã được nhập."
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "Hãy chọn một tập tin."
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "Phải cung cấp tên sổ địa chỉ."
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "Lỗi khi đọc các trường LDIF."
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "Nhập khẩu thành công tập tin LDIF."
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "Chọn tập tin vCard"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "Tên tập tin"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "Trường LDIF"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "Sổ địa chỉ:"
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "Lên"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "Xuống"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "Sổ địa chỉ:"
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "Tên tập tin:"
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "Mảng:"
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "Nhập khẩu tập tin LDIF vào sổ địa chỉ"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "Tiếp"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "Trước"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "Thông tin tập tin"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "Trường LDIF"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "Hoàn thành"
 
@@ -2965,7 +2981,7 @@ msgstr "Đang thoát"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "Đang lấy thư (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3058,16 +3074,16 @@ msgstr "Nhập mật khẩu"
 msgid "Protocol log"
 msgstr "Theo dõi giao thức"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "Cách dùng: %s [TUỲ CHỌN]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [địa chỉ]    mở cửa sổ soạn thảo"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3077,23 +3093,23 @@ msgstr ""
 "                         mở cửa sổ soạn thảo với tập tin đính kèm\n"
 "                         đã chỉ định"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              nhận thư mới"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          nhận thư mới từ mọi tài khoản"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 gửi mọi thư đã xếp hàng"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [thư mục]...   hiện tổng số thư"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3101,45 +3117,45 @@ msgstr ""
 "  --status-full [thư mục]...\n"
 "                         hiện trạng thái của từng thư mục"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --exit                đóng Sylpheed"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                chế độ gỡ lỗi"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 hiển thị phần giúp đỡ này và thoát"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              đưa ra thông tin phiên bản và thoát"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "Mã của tên tập tin"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3163,19 +3179,19 @@ msgstr ""
 "\n"
 "Tiếp tục?"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "Đang viết thư. Bạn thực sự muốn thoát?"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "Các thư đang đợi gửi"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "Một số thư chưa gửi đã được xếp hàng. Thoát bây giờ?"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3183,20 +3199,20 @@ msgstr ""
 "GnuPG không được cài đặt hoàn hảo, hoặc phiên bản quá cũ.\n"
 "Việc hỗ trợ OpenGPG bị cấm."
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "một tiến trình Sylpheed khác đang chạy.\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "Di trú cấu hình"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3546,15 +3562,15 @@ msgstr "/_Xem/Mã _kí tự/Hán (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/_Xem/_Mở trong cửa sổ mới"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/_Xem/_Nguồn thư"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/_Xem/Mọi _header"
@@ -3859,8 +3875,8 @@ msgstr "Đang tạo cửa sổ chính...\n"
 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:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -3928,7 +3944,7 @@ msgstr "Sylpheed - Khung thư mục"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
@@ -3944,15 +3960,15 @@ msgstr "/Hồi âm cho người _gửi"
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
@@ -3999,20 +4015,20 @@ msgstr "Thoát chương trình này?"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "Chọn thư mục"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 msgid "Command line options"
 msgstr "Tuỳ chọn dòng lệnh"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "Cách dùng: sylpheed [TUỲ CHỌN]..."
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 #, fuzzy
 msgid ""
 "--compose [address]\n"
@@ -4042,7 +4058,7 @@ msgstr ""
 "--help\n"
 "--version"
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 #, fuzzy
 msgid ""
 "open composition window\n"
@@ -4072,15 +4088,15 @@ msgstr ""
 "hiện thông tin trợ giúp này và thoát\n"
 "đưa ra thông tin phiên bản và thoát"
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4137,7 +4153,7 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr "Khung xem thư - Sylpheed"
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
@@ -4158,7 +4174,7 @@ msgstr "/_Lưu là..."
 msgid "/Save _all..."
 msgstr "/Lưu _tất cả..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/I_n ấn..."
 
@@ -4558,7 +4574,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Đầu ra của lệnh"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "Tự động đặt địa chỉ sau"
 
@@ -4811,7 +4827,7 @@ msgstr " Hỗ trợ cú pháp "
 msgid "Registered actions"
 msgstr "Hành động đã đăng kí"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "Mới"
 
@@ -6178,28 +6194,28 @@ msgstr "Loại"
 msgid "Normal"
 msgstr "Bình thường"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Không hiển thị [...] hoặc (...) ở đầu tiêu đề trong bảng tóm tắt"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Xoá [...] hoặc (...) ở đầu tiêu đề khi hồi âm"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "Tài khoản"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "Áp dụng cho thư mục con"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "dùng cho cả lúc hồi âm"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -6235,19 +6251,19 @@ msgstr "Đính kèm"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "Thời gian"
 
@@ -6257,7 +6273,7 @@ msgid "Number"
 msgstr "Số"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "Người nhận:"
@@ -6279,43 +6295,61 @@ msgstr ""
 "Chọn các mục sẽ được hiển thị ở bảng tóm tắt. Bạn có thể thay đổi\n"
 "thứ tự bằng cách dùng nút Lên / Xuống, hoặc kéo thả."
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "Tên mẫu"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "Đăng kí"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " Thay thế "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " Biểu tượng "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "Các mẫu đã đăng kí"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "Mẫu"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "Tên mẫu"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "Tên mẫu"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "Mẫu"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "Lỗi định dạng mẫu."
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "Xoá mẫu"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "Bạn có thực sự muốn xoá mẫu này không?"
 
@@ -6562,7 +6596,7 @@ msgstr "Đang tìm %s (%d / %d)..."
 msgid "Searching %s ..."
 msgstr "Đang tìm %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
@@ -6665,7 +6699,7 @@ msgstr "Giới t_hiệu"
 msgid "%s - POP3 Remote mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "Số "
 
@@ -7234,7 +7268,7 @@ msgstr "Đang lấy danh sách nhóm tin..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Không lấy được danh sách nhóm tin."
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "Xong."
 
@@ -7243,348 +7277,348 @@ msgstr "Xong."
 msgid "%d newsgroups received (%s read)"
 msgstr "Nhận được %d nhóm tin (đã đọc %s)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/Hồi â_m cho"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/Hồi â_m cho/_tất cả"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/Hồi â_m cho/_người gửi"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/Hồi â_m cho/_hộp thư chung"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/_Di chuyển..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/_Sao chép"
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/Đánh _dấu"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/Đánh _dấu/Đánh _dấu"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/Đánh _dấu/_Bỏ đánh dấu"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/Đánh _dấu/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Đánh _dấu/Đá_nh dấu là chưa đọc"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Đánh _dấu/Đán_h dấu đã đọc"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 msgid "/_Mark/Mark _thread as read"
 msgstr "/Đánh _dấu/Đán_h dấu luồng đã đọc"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/Đánh _dấu/Đánh dấ_u đã đọc tất cả"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/_Nhãn màu"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "Coi là thư rác"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "Coi là thư rác"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/S_oạn lại"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/_Thêm người gửi vào sổ địa chỉ..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/Tạo _quy tắc lọc"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Tạo _quy tắc lọc/_Tự động"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Tạo _quy tắc lọc/theo _Người gửi"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Tạo _quy tắc lọc/theo N_gười nhận"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Tạo _quy tắc lọc/theo Tiê_u đề"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "Đang tạo khung xem tóm tắt...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "Đang quét thư mục (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "Đánh dấu tiến trình"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "Vẫn còn sót một số dấu. Xử lí chúng?"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Đang quét thư mục (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "Không thể tạo phiên IMAP4 với: %s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "_Tìm lại"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "Không có thêm thư chưa đọc"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "Không thấy thư nào chưa đọc. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "Không có thư nào chưa đọc."
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "Không thấy thư nào chưa đọc. Chuyển sang thư mục tiếp theo?"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "Không có thêm thư mới"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "Không có thư mới. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "Không có thư mới."
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "Không thấy thư mới nào. Tìm trong thư mục tiếp theo?"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "Không có thêm thư được đánh dấu"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "Không có thư nào được dánh dấu."
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ đầu?"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "Không thấy nào được gán nhãn. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "Không có thư được gán nhãn."
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Không thấy thư nào được gán nhãn. Tìm từ đầu?"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "Tập trung thư theo tiêu đề..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "đã xoá %d"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "đã chuyển %s%d"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "đã chép %s%d"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " mục được chọn"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d mới, %d chưa đọc, %d tổng số (%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d mới, %d chưa đọc, %d tổng số"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "Đang sắp xếp bảng tóm tắt..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\tĐang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "Chọn thư mục"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 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:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "Chọn thư mục"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc (%d / %d)..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 33b57c4b..8005128a 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -323,7 +323,7 @@ msgstr ""
 "文件“%s”已存在。\n"
 "无法创建文件件。"
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -502,12 +502,12 @@ msgstr "发现 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "配置已经保存。\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "文件夹："
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 #, fuzzy
 msgid "Junk mail filter"
 msgstr "文件夹："
@@ -649,7 +649,7 @@ msgstr ""
 "Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
 "1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -687,7 +687,7 @@ msgstr ""
 "按照该顺序检查新邮件。选中“G”列的复选框，在“全部接收”\n"
 "时会检查新邮件。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -830,8 +830,8 @@ msgstr "将地址添加到地址簿"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "注释"
 
@@ -839,34 +839,34 @@ msgstr "注释"
 msgid "Select Address Book Folder"
 msgstr "选择地址簿文件夹"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "已注册的规则"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/文件(_F)"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/文件(_F)/新建地址簿(_B)"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/文件(_F)/新建 vCard(_V)"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/文件(_F)/新建 JPilot(_J)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/文件(_F)/新建服务器(_S)"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -874,196 +874,196 @@ msgstr "/文件(_F)/新建服务器(_S)"
 msgid "/_File/---"
 msgstr "/文件(_F)/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/文件(_F)/编辑(_E)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/文件(_F)/删除(_D)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/文件(_F)/保存(_S)"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/文件(_F)/关闭(_C)"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/编辑(_E)/复制(_C)"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新建地址(_A)"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新建组(_G)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新建文件夹(_F)"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/编辑(_E)"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/删除(_D)"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/导入LDIF文件(_L)"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/帮助(_H)"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/帮助(_H)/关于(_A)"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/新建地址(_A)"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/新建组(_G)"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/复制(_C)..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/编辑(_E)/粘贴(_P)"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "地址簿"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "文件夹"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "搜索"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件抄送："
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "删除"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "添加"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "搜索"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "关闭"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "删除地址"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "真的要删除地址？"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, fuzzy, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1072,38 +1072,38 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "删除文件夹"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "_Folder only"
 msgstr "仅文件夹"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 #, fuzzy
 msgid "Folder and _addresses"
 msgstr "文件夹和地址"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "真的要删除“%s”？"
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "新建用户，无法保存索引文件。"
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "新建用户，无法保存地址簿文件。"
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr "成功转换旧的地址簿。"
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1111,7 +1111,7 @@ msgstr ""
 "已经转换旧的地址簿，\n"
 "无法保存新的地址索引文件"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1119,7 +1119,7 @@ msgstr ""
 "无法转换地址簿，\n"
 "但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1127,23 +1127,23 @@ msgstr ""
 "无法转换地址簿，\n"
 "无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1151,73 +1151,73 @@ msgid ""
 "%s%c%s"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "地址簿错误"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr "已经转换旧的地址簿，无法保存新的地址索引文件"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "无法转换地址簿，但创建了空的新地址簿文件。"
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "无法转换地址簿，无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "无法转换地址簿且无法创建新的地址簿文件。"
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "无法读取地址索引"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "地址簿转换错误"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "地址簿转换"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "界面"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "地址簿"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "个人"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "电子邮件地址"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "群组"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP 服务器"
 
@@ -1229,11 +1229,11 @@ msgstr "公用地址"
 msgid "Personal address"
 msgstr "个人地址"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "警告"
 
@@ -1280,7 +1280,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "没有"
 
@@ -1296,8 +1296,8 @@ msgstr "/添加(_A)..."
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
@@ -1372,7 +1372,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/查看(_V)"
 
@@ -1632,7 +1632,7 @@ msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -1676,7 +1676,7 @@ msgstr "自动设置以下地址"
 msgid "From:"
 msgstr "发件人："
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "标题："
 
@@ -1823,7 +1823,7 @@ msgstr "MIME 类型"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "大小"
 
@@ -1954,28 +1954,28 @@ msgstr "必须输入名字和值。"
 msgid "Edit Person Data"
 msgstr "编辑联系人信息"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "显示姓名"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "姓氏"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "名字"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "昵称"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "电子邮件地址"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "别名"
 
@@ -2089,12 +2089,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2111,7 +2111,7 @@ msgid "Edit JPilot Entry"
 msgstr "编辑 JPilot 项"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr " ... "
@@ -2304,198 +2304,204 @@ msgstr ""
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr ""
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/创建新文件夹(_N)..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/重命名文件夹(_R)..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/重命名文件夹(_R)..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/删除文件夹(_D)"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/清空废件箱(_T)"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/清空废件箱(_T)"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/重建文件夹树(_E)"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "标记为已读"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "发送队列中的邮件"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/查找邮件(_S)..."
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/下载(_L)"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/订阅新闻组(_B)..."
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/删除新闻组(_R)"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "正在创建文件夹视图...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "新建"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "未读"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "正在设置文件夹信息...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "文件夹树将重建。继续吗？"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "正在重建文件夹树..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建文件夹树失败。"
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr ""
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2505,26 +2511,26 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2533,12 +2539,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2549,21 +2555,31 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "主题"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "清空废件箱里的所有信件？"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2572,34 +2588,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2612,7 +2628,7 @@ msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -2692,120 +2708,120 @@ msgstr "选择导入文件"
 msgid "Select importing file"
 msgstr "选择导入文件"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "请指定要导入的地址簿名和文件。"
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "选择并重命名要导入的LDIF字段名。"
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "文件已导入。"
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "请选择一个文件。"
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "必须输入地址簿名。"
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "读取 LDIF 字段时发生错误。"
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "成功导入 LDIF 文件。"
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "选择 vCard 文件"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "文件名"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF 字段"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "地址簿："
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "上移"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "下移"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "地址簿："
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "文件名："
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "记录："
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "导入 LDIF 文件到地址簿"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "下一个"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "上一个"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "文件信息"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF 字段"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "完成"
 
@@ -2984,7 +3000,7 @@ msgstr "正在退出"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "正在获取邮件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3077,16 +3093,16 @@ msgstr "输入密码"
 msgid "Protocol log"
 msgstr "协议记录"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [address]    打开撰写窗口"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3095,23 +3111,23 @@ msgstr ""
 "  --attach 文件1 [文件2]...\n"
 "                         打开撰写窗口并添加指定的附件"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              接收新邮件"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          接收所有帐号的新邮件"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 发送队列中的邮件"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [文件夹]...   显示邮件总数"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
@@ -3119,49 +3135,49 @@ msgstr ""
 "  --status-full [文件夹]...\n"
 "                         显示每个文件夹的状态"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                调试模式"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 显示该帮助并退出"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              输出版本信息并退出"
 
-#: src/main.c:597
+#: src/main.c:600
 #, fuzzy, c-format
 msgid "Press any key..."
 msgstr ""
 "或按下“y”键。\n"
 "\n"
 
-#: src/main.c:728
+#: src/main.c:731
 #, fuzzy
 msgid "Filename encoding"
 msgstr "发送时使用的字符编码"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3175,19 +3191,19 @@ msgid ""
 "Continue?"
 msgstr ""
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "正在撰写邮件。真的要退出吗？"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "队列中的邮件"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "一些未发送的信件被放入队列。现在退出吗？"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3195,20 +3211,20 @@ msgstr ""
 "没有正确安装 GnuPG，或者版本太老。\n"
 "已禁用 OpenPGP 支持。"
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "另外一个 Sylpheed 正在运行。\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "正在迁移配置"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3562,15 +3578,15 @@ msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/查看(_V)/邮件源文件(_A)"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/查看(_V)/所有标题(_H)"
@@ -3882,8 +3898,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3952,7 +3968,7 @@ msgstr "Sylpheed－文件夹视图"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
@@ -3968,15 +3984,15 @@ msgstr "/回复到发件人(_S)"
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
@@ -4023,22 +4039,22 @@ msgstr "要退出本程序吗？"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "选择文件夹"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "没有设置命令行。"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [OPTION]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4055,7 +4071,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4072,15 +4088,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4137,7 +4153,7 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
@@ -4159,7 +4175,7 @@ msgstr "/另存为(_S)..."
 msgid "/Save _all..."
 msgstr "/另存为(_S)..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/打印(_P)..."
 
@@ -4565,7 +4581,7 @@ msgstr ""
 msgid "Command output"
 msgstr "命令输出"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "自动设置以下地址"
 
@@ -4821,7 +4837,7 @@ msgstr " 语法帮助 "
 msgid "Registered actions"
 msgstr "已注册的动作"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "(新建)"
 
@@ -6215,28 +6231,28 @@ msgstr "类型"
 msgid "Normal"
 msgstr "普通"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "在摘要中主题之前不显示 [...] 或 (...)"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回复时删除主题前的 [...] 或 (...)"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "帐号"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "应用到子文件夹"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "回复时也使用"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "回复至："
 
@@ -6274,19 +6290,19 @@ msgstr "附件"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "日期"
 
@@ -6296,7 +6312,7 @@ msgid "Number"
 msgstr "序号"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "收件人："
@@ -6318,43 +6334,61 @@ msgstr ""
 "选择要显示在摘要视图中的项目。您可以使用“向上”或“向下”按钮\n"
 "修改顺序，或拖动项目来修改顺序。"
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "模板名"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "注册"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " 替换 "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " 符号 "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "已注册的模板"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "模板"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "模板名"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "模板名"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "模板"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "模板格式错误。"
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "删除模板"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "您确实要删除该模板吗？"
 
@@ -6603,7 +6637,7 @@ msgstr "正在过滤..."
 msgid "Searching %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(没有日期)"
 
@@ -6711,7 +6745,7 @@ msgstr "关于"
 msgid "%s - POP3 Remote mailbox"
 msgstr "删除邮箱"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "No."
 
@@ -7281,7 +7315,7 @@ msgstr "无法取回新闻组列表。"
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "完成。"
 
@@ -7290,351 +7324,351 @@ msgstr "完成。"
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 个新闻组(已读取 %s)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/回复到(_Y)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/回复到(_Y)/全部(_A)"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/回复到(_Y)/发件人(_S)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/回复到(_Y)/邮件列表(_L)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/移动(_O)..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/复制(_C)..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/标记(_M)"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/标记(_M)/标记(_M)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/标记(_M)/取消标记(_U)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/标记(_M)/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/标记(_M)/标记为未读(_E)"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_D)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/标记(_M)/标记为已读(_D)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/标记(_M)/全部标记为已读(_R)"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/颜色标签(_B)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "设置为默认帐号"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "设置为默认帐号"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/重新编辑(_E)"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/创建过滤规则(_i)"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/创建过滤规则(_i)/自动(_A)"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/创建过滤规则(_i)/按发件人(_F)"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/创建过滤规则(_i)/按收件人(_T)"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/创建过滤规则(_i)/按主题(_S)"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "正在创建摘要视图...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "处理标志"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "有一些剩余标记。处理吗？"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 #, fuzzy
 msgid "_Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "选择文件夹"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "选择文件夹"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index a6251236..faa6fc3c 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: 2010-07-16 15:59+0900\n"
+"POT-Creation-Date: 2010-07-29 17:14+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"
@@ -322,7 +322,7 @@ msgstr ""
 "檔案「%s」已存在。\n"
 "無法產生資料夾。"
 
-#: libsylph/mh.c:1772
+#: libsylph/mh.c:1773
 #, c-format
 msgid ""
 "Directory name\n"
@@ -507,12 +507,12 @@ msgstr "找到 %s\n"
 msgid "Configuration is saved.\n"
 msgstr "組態設定已儲存。\n"
 
-#: libsylph/prefs_common.c:593
+#: libsylph/prefs_common.c:605
 #, fuzzy
 msgid "Junk mail filter (manual)"
 msgstr "垃圾郵件資料夾"
 
-#: libsylph/prefs_common.c:596
+#: libsylph/prefs_common.c:608
 msgid "Junk mail filter"
 msgstr "垃圾郵件資料夾"
 
@@ -654,7 +654,7 @@ msgstr ""
 "您應該已經隨軟體收到一份 GPL；若沒有，請寫信到自由軟體基金會，地址是：\n"
 "59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
 
-#: src/account_dialog.c:139 src/mainwindow.c:3941
+#: src/account_dialog.c:139 src/mainwindow.c:3943
 msgid ""
 "Some composing windows are open.\n"
 "Please close all the composing windows before editing the accounts."
@@ -692,7 +692,7 @@ msgstr ""
 "檢查新郵件時將會依照下面的順序。您可以勾選 G 欄位中的方塊，\n"
 "來決定是否在「全部檢查」時要檢查該帳號的郵件。"
 
-#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:683
+#: src/account_dialog.c:375 src/addressadd.c:178 src/addressbook.c:749
 #: src/compose.c:5298 src/editaddress.c:777 src/editaddress.c:826
 #: src/editbook.c:198 src/editgroup.c:266 src/editjpilot.c:270
 #: src/editldap.c:307 src/editvcard.c:183 src/mimeview.c:226
@@ -833,8 +833,8 @@ msgstr "將地址加入通訊錄"
 msgid "Address"
 msgstr "地址"
 
-#: src/addressadd.c:198 src/addressbook.c:726 src/editaddress.c:629
-#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:125
+#: src/addressadd.c:198 src/addressbook.c:792 src/editaddress.c:629
+#: src/editaddress.c:695 src/editgroup.c:268 src/importcsv.c:126
 msgid "Remarks"
 msgstr "備註"
 
@@ -842,34 +842,34 @@ msgstr "備註"
 msgid "Select Address Book Folder"
 msgstr "選擇通訊錄資料夾"
 
-#: src/addressadd.c:311 src/addressbook.c:950 src/addressbook.c:3082
+#: src/addressadd.c:311 src/addressbook.c:1028 src/addressbook.c:3447
 #, fuzzy
 msgid "Auto-registered address"
 msgstr "已紀錄之郵件樣板符號"
 
-#: src/addressbook.c:341 src/compose.c:578 src/mainwindow.c:546
+#: src/addressbook.c:395 src/compose.c:578 src/mainwindow.c:546
 #: src/messageview.c:149
 msgid "/_File"
 msgstr "/檔案(_F)"
 
-#: src/addressbook.c:342
+#: src/addressbook.c:396
 msgid "/_File/New _Book"
 msgstr "/檔案(_F)/新增通訊錄(_B)"
 
-#: src/addressbook.c:343
+#: src/addressbook.c:397
 msgid "/_File/New _vCard"
 msgstr "/檔案(_F)/新增vCard(_V)"
 
-#: src/addressbook.c:345
+#: src/addressbook.c:399
 msgid "/_File/New _JPilot"
 msgstr "/檔案(_F)/新增J-Pilot(_J)"
 
-#: src/addressbook.c:348
+#: src/addressbook.c:402
 #, fuzzy
 msgid "/_File/New _LDAP Server"
 msgstr "/檔案(_F)/新增伺服器(_S)"
 
-#: src/addressbook.c:350 src/addressbook.c:353 src/compose.c:583
+#: src/addressbook.c:404 src/addressbook.c:407 src/compose.c:583
 #: src/compose.c:588 src/compose.c:591 src/compose.c:594 src/mainwindow.c:564
 #: src/mainwindow.c:567 src/mainwindow.c:569 src/mainwindow.c:571
 #: src/mainwindow.c:576 src/mainwindow.c:578 src/messageview.c:151
@@ -877,196 +877,196 @@ msgstr "/檔案(_F)/新增伺服器(_S)"
 msgid "/_File/---"
 msgstr "/檔案(_F)/---"
 
-#: src/addressbook.c:351
+#: src/addressbook.c:405
 msgid "/_File/_Edit"
 msgstr "/檔案(_F)/編輯(_E)"
 
-#: src/addressbook.c:352
+#: src/addressbook.c:406
 msgid "/_File/_Delete"
 msgstr "/檔案(_F)/刪除(_D)"
 
-#: src/addressbook.c:354
+#: src/addressbook.c:408
 msgid "/_File/_Save"
 msgstr "/檔案(_F)/儲存(_S)"
 
-#: src/addressbook.c:355 src/compose.c:595 src/messageview.c:157
+#: src/addressbook.c:409 src/compose.c:595 src/messageview.c:157
 msgid "/_File/_Close"
 msgstr "/檔案(_F)/關閉(_C)"
 
-#: src/addressbook.c:357 src/addressbook.c:397 src/addressbook.c:407
+#: src/addressbook.c:411 src/addressbook.c:451 src/addressbook.c:461
 #: src/compose.c:597 src/mainwindow.c:582 src/messageview.c:159
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:358 src/compose.c:602 src/mainwindow.c:583
+#: src/addressbook.c:412 src/compose.c:602 src/mainwindow.c:583
 #: src/messageview.c:160
 msgid "/_Edit/_Copy"
 msgstr "/編輯(_E)/複製(_C)"
 
-#: src/addressbook.c:359 src/compose.c:603
+#: src/addressbook.c:413 src/compose.c:603
 msgid "/_Edit/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:361
+#: src/addressbook.c:415
 msgid "/_Address"
 msgstr "/地址(_A)"
 
-#: src/addressbook.c:362
+#: src/addressbook.c:416
 msgid "/_Address/New _Address"
 msgstr "/地址(_A)/新增地址(_A)"
 
-#: src/addressbook.c:363
+#: src/addressbook.c:417
 msgid "/_Address/New _Group"
 msgstr "/地址(_A)/新增群組(_G)"
 
-#: src/addressbook.c:364
+#: src/addressbook.c:418
 msgid "/_Address/New _Folder"
 msgstr "/地址(_A)/新增資料夾(_F)"
 
-#: src/addressbook.c:365
+#: src/addressbook.c:419
 msgid "/_Address/---"
 msgstr "/地址(_A)/---"
 
-#: src/addressbook.c:366
+#: src/addressbook.c:420
 msgid "/_Address/_Edit"
 msgstr "/地址(_A)/編輯(_E)"
 
-#: src/addressbook.c:367
+#: src/addressbook.c:421
 msgid "/_Address/_Delete"
 msgstr "/地址(_A)/刪除(_D)"
 
-#: src/addressbook.c:369 src/compose.c:713 src/mainwindow.c:830
+#: src/addressbook.c:423 src/compose.c:713 src/mainwindow.c:830
 #: src/messageview.c:282
 msgid "/_Tools"
 msgstr "/工具(_T)"
 
-#: src/addressbook.c:370
+#: src/addressbook.c:424
 msgid "/_Tools/Import _LDIF file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:371
+#: src/addressbook.c:425
 #, fuzzy
 msgid "/_Tools/Import _CSV file"
 msgstr "/工具(_T)/匯入 LDIF 檔(_L)"
 
-#: src/addressbook.c:373 src/compose.c:737 src/mainwindow.c:888
+#: src/addressbook.c:427 src/compose.c:737 src/mainwindow.c:888
 #: src/messageview.c:302
 msgid "/_Help"
 msgstr "/說明(_H)"
 
-#: src/addressbook.c:374 src/compose.c:738 src/mainwindow.c:904
+#: src/addressbook.c:428 src/compose.c:738 src/mainwindow.c:904
 #: src/messageview.c:303
 msgid "/_Help/_About"
 msgstr "/說明(_H)/關於(_A)"
 
-#: src/addressbook.c:393 src/addressbook.c:403
+#: src/addressbook.c:447 src/addressbook.c:457
 msgid "/New _Address"
 msgstr "/新增地址(_A)"
 
-#: src/addressbook.c:394 src/addressbook.c:404
+#: src/addressbook.c:448 src/addressbook.c:458
 msgid "/New _Group"
 msgstr "/新增群組(_G)"
 
-#: src/addressbook.c:395 src/addressbook.c:405
+#: src/addressbook.c:449 src/addressbook.c:459
 msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
-#: src/addressbook.c:396 src/addressbook.c:406 src/addressbook.c:409
-#: src/compose.c:569 src/compose.c:572 src/folderview.c:257
-#: src/folderview.c:259 src/folderview.c:264 src/folderview.c:267
-#: src/folderview.c:280 src/folderview.c:282 src/folderview.c:284
-#: src/folderview.c:289 src/folderview.c:292 src/folderview.c:306
-#: src/folderview.c:308 src/folderview.c:312 src/folderview.c:314
-#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:428
-#: src/summaryview.c:432 src/summaryview.c:435 src/summaryview.c:447
-#: src/summaryview.c:449 src/summaryview.c:452 src/summaryview.c:454
-#: src/summaryview.c:466 src/summaryview.c:472
+#: src/addressbook.c:450 src/addressbook.c:460 src/addressbook.c:463
+#: src/compose.c:569 src/compose.c:572 src/folderview.c:258
+#: src/folderview.c:261 src/folderview.c:266 src/folderview.c:269
+#: src/folderview.c:282 src/folderview.c:285 src/folderview.c:287
+#: src/folderview.c:292 src/folderview.c:295 src/folderview.c:309
+#: src/folderview.c:311 src/folderview.c:315 src/folderview.c:317
+#: src/mimeview.c:141 src/mimeview.c:151 src/summaryview.c:432
+#: src/summaryview.c:436 src/summaryview.c:439 src/summaryview.c:451
+#: src/summaryview.c:453 src/summaryview.c:456 src/summaryview.c:458
+#: src/summaryview.c:470 src/summaryview.c:476
 msgid "/---"
 msgstr "/---"
 
-#: src/addressbook.c:398 src/addressbook.c:408 src/summaryview.c:448
+#: src/addressbook.c:452 src/addressbook.c:462 src/summaryview.c:452
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
-#: src/addressbook.c:410
+#: src/addressbook.c:464
 #, fuzzy
 msgid "/_Copy"
 msgstr "/複製(_C)..."
 
-#: src/addressbook.c:411
+#: src/addressbook.c:465
 #, fuzzy
 msgid "/_Paste"
 msgstr "/編輯(_E)/貼上(_P)"
 
-#: src/addressbook.c:536 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
+#: src/addressbook.c:590 src/prefs_common_dialog.c:2546 src/prefs_toolbar.c:90
 msgid "Address book"
 msgstr "通訊錄"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:610 src/addressbook.c:3776 src/folderview.c:392
+#: src/addressbook.c:664 src/addressbook.c:4150 src/folderview.c:395
 #: src/prefs_account_dialog.c:1835 src/query_search.c:400
 msgid "Folder"
 msgstr "資料夾"
 
-#: src/addressbook.c:712
+#: src/addressbook.c:778
 msgid "E-Mail address"
 msgstr "E-Mail 地址"
 
-#: src/addressbook.c:751 src/quick_search.c:128
+#: src/addressbook.c:829 src/quick_search.c:128
 #, fuzzy
 msgid "Search:"
 msgstr "尋找"
 
-#: src/addressbook.c:789 src/compose.c:3270 src/headerview.c:55
-#: src/prefs_folder_item.c:339 src/prefs_template.c:179
+#: src/addressbook.c:867 src/compose.c:3270 src/headerview.c:55
+#: src/prefs_folder_item.c:340 src/prefs_template.c:197
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:793 src/compose.c:3287 src/headerview.c:56
-#: src/prefs_folder_item.c:356 src/prefs_template.c:181
+#: src/addressbook.c:871 src/compose.c:3287 src/headerview.c:56
+#: src/prefs_folder_item.c:357 src/prefs_template.c:199
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:797 src/compose.c:3304 src/prefs_folder_item.c:367
-#: src/prefs_template.c:183
+#: src/addressbook.c:875 src/compose.c:3304 src/prefs_folder_item.c:368
+#: src/prefs_template.c:201
 msgid "Bcc:"
 msgstr "密件副本"
 
 #. Buttons
-#: src/addressbook.c:818 src/addressbook.c:1894 src/editaddress.c:719
+#: src/addressbook.c:896 src/addressbook.c:2236 src/editaddress.c:719
 #: src/editaddress.c:853 src/prefs_actions.c:266
 #: src/prefs_display_header.c:280 src/prefs_display_header.c:336
-#: src/prefs_template.c:239 src/prefs_toolbar.c:65
+#: src/prefs_template.c:260 src/prefs_toolbar.c:65
 msgid "Delete"
 msgstr "刪除"
 
-#: src/addressbook.c:821 src/editaddress.c:725 src/editaddress.c:859
+#: src/addressbook.c:899 src/editaddress.c:725 src/editaddress.c:859
 #: src/prefs_actions.c:254 src/prefs_customheader.c:232
 #: src/prefs_display_header.c:274 src/prefs_display_header.c:330
 #: src/prefs_filter_edit.c:1603
 msgid "Add"
 msgstr "新增"
 
-#: src/addressbook.c:824 src/prefs_toolbar.c:80
+#: src/addressbook.c:902 src/prefs_toolbar.c:80
 #, fuzzy
 msgid "Search"
 msgstr "尋找"
 
-#: src/addressbook.c:827
+#: src/addressbook.c:905
 #, fuzzy
 msgid "_Close"
 msgstr "顏色"
 
 #. Confirm deletion
-#: src/addressbook.c:1023
+#: src/addressbook.c:1101
 msgid "Delete address(es)"
 msgstr "刪除通訊紀錄"
 
-#: src/addressbook.c:1024
+#: src/addressbook.c:1102
 msgid "Really delete the address(es)?"
 msgstr "您確定要刪除這些紀錄嗎？"
 
-#: src/addressbook.c:1885
+#: src/addressbook.c:2227
 #, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
@@ -1075,38 +1075,38 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1888 src/folderview.c:2612
+#: src/addressbook.c:2230 src/folderview.c:2672
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "_Folder only"
 msgstr "只刪除資料夾(_F)"
 
-#: src/addressbook.c:1888
+#: src/addressbook.c:2230
 msgid "Folder and _addresses"
 msgstr "全部刪除(_A)"
 
-#: src/addressbook.c:1893
+#: src/addressbook.c:2235
 #, c-format
 msgid "Really delete `%s' ?"
 msgstr "您確定要刪除「%s」? "
 
-#: src/addressbook.c:2828 src/addressbook.c:2966
+#: src/addressbook.c:3193 src/addressbook.c:3331
 msgid "New user, could not save index file."
 msgstr "無法儲存索引檔案。"
 
-#: src/addressbook.c:2832 src/addressbook.c:2970
+#: src/addressbook.c:3197 src/addressbook.c:3335
 msgid "New user, could not save address book files."
 msgstr "無法儲存通訊錄檔案。"
 
-#: src/addressbook.c:2842 src/addressbook.c:2980
+#: src/addressbook.c:3207 src/addressbook.c:3345
 msgid "Old address book converted successfully."
 msgstr ""
 "轉換舊通訊錄格式完成。\n"
 "您可以開始使用新的通訊錄。"
 
-#: src/addressbook.c:2847
+#: src/addressbook.c:3212
 msgid ""
 "Old address book converted,\n"
 "could not save new address index file"
@@ -1114,7 +1114,7 @@ msgstr ""
 "舊通訊錄格式已轉換，\n"
 "但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2860
+#: src/addressbook.c:3225
 msgid ""
 "Could not convert address book,\n"
 "but created empty new address book files."
@@ -1122,7 +1122,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "但已產生空的新通訊錄。"
 
-#: src/addressbook.c:2866
+#: src/addressbook.c:3231
 msgid ""
 "Could not convert address book,\n"
 "could not create new address book files."
@@ -1130,7 +1130,7 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2871
+#: src/addressbook.c:3236
 msgid ""
 "Could not convert address book\n"
 "and could not create new address book files."
@@ -1138,17 +1138,17 @@ msgstr ""
 "無法轉換通訊錄格式，\n"
 "亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:2878
+#: src/addressbook.c:3243
 #, fuzzy
 msgid "Address book conversion error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:2882
+#: src/addressbook.c:3247
 #, fuzzy
 msgid "Address book conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:2921
+#: src/addressbook.c:3286
 #, fuzzy, c-format
 msgid ""
 "Could not read address index:\n"
@@ -1156,73 +1156,73 @@ msgid ""
 "%s%c%s"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:2924
+#: src/addressbook.c:3289
 #, fuzzy
 msgid "Address Book Error"
 msgstr "通訊錄發生錯誤"
 
-#: src/addressbook.c:2985
+#: src/addressbook.c:3350
 msgid "Old address book converted, could not save new address index file"
 msgstr "舊通訊錄格式已轉換，但無法儲存新的索引檔。"
 
-#: src/addressbook.c:2999
+#: src/addressbook.c:3364
 msgid ""
 "Could not convert address book, but created empty new address book files."
 msgstr "無法轉換通訊錄格式，但已產生空的新通訊錄。"
 
-#: src/addressbook.c:3005
+#: src/addressbook.c:3370
 msgid ""
 "Could not convert address book, could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3011
+#: src/addressbook.c:3376
 msgid ""
 "Could not convert address book and could not create new address book files."
 msgstr "無法轉換通訊錄格式，亦無法產生新的通訊錄。"
 
-#: src/addressbook.c:3023
+#: src/addressbook.c:3388
 msgid "Could not read address index"
 msgstr "無法讀取通訊錄索引"
 
-#: src/addressbook.c:3029
+#: src/addressbook.c:3394
 #, fuzzy
 msgid "Address Book Conversion Error"
 msgstr "轉換通訊錄格式時發生錯誤"
 
-#: src/addressbook.c:3035
+#: src/addressbook.c:3400
 #, fuzzy
 msgid "Address Book Conversion"
 msgstr "通訊錄格式轉換"
 
-#: src/addressbook.c:3706 src/prefs_common_dialog.c:2364
+#: src/addressbook.c:4080 src/prefs_common_dialog.c:2364
 msgid "Interface"
 msgstr "介面"
 
-#: src/addressbook.c:3720 src/importcsv.c:671 src/importldif.c:478
+#: src/addressbook.c:4094 src/importcsv.c:676 src/importldif.c:478
 msgid "Address Book"
 msgstr "通訊錄"
 
-#: src/addressbook.c:3734
+#: src/addressbook.c:4108
 msgid "Person"
 msgstr "人名"
 
-#: src/addressbook.c:3748
+#: src/addressbook.c:4122
 msgid "EMail Address"
 msgstr "電子郵件信箱"
 
-#: src/addressbook.c:3762
+#: src/addressbook.c:4136
 msgid "Group"
 msgstr "群組"
 
-#: src/addressbook.c:3790
+#: src/addressbook.c:4164
 msgid "vCard"
 msgstr "vCard"
 
-#: src/addressbook.c:3804 src/addressbook.c:3818
+#: src/addressbook.c:4178 src/addressbook.c:4192
 msgid "JPilot"
 msgstr "JPilot"
 
-#: src/addressbook.c:3832
+#: src/addressbook.c:4206
 msgid "LDAP Server"
 msgstr "LDAP 伺服器"
 
@@ -1234,11 +1234,11 @@ msgstr "共用通訊紀錄"
 msgid "Personal address"
 msgstr "私人通訊紀錄"
 
-#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:767
+#: src/alertpanel.c:142 src/compose.c:6712 src/main.c:770
 msgid "Notice"
 msgstr "注意"
 
-#: src/alertpanel.c:155 src/main.c:887
+#: src/alertpanel.c:155 src/main.c:893
 msgid "Warning"
 msgstr "警告"
 
@@ -1285,7 +1285,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:300 src/prefs_folder_item.c:316 src/summaryview.c:5106
+#: src/colorlabel.c:300 src/prefs_folder_item.c:317 src/summaryview.c:5117
 msgid "None"
 msgstr "無"
 
@@ -1301,8 +1301,8 @@ msgstr "/新增(_A)..."
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:573 src/folderview.c:271 src/folderview.c:296
-#: src/folderview.c:318
+#: src/compose.c:573 src/folderview.c:273 src/folderview.c:299
+#: src/folderview.c:321
 msgid "/_Properties..."
 msgstr "/內容(_P)..."
 
@@ -1377,7 +1377,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
 #: src/compose.c:613 src/mainwindow.c:592 src/messageview.c:166
-#: src/summaryview.c:467
+#: src/summaryview.c:471
 msgid "/_View"
 msgstr "/顯示(_V)"
 
@@ -1634,7 +1634,7 @@ msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
 #: src/compose.c:2847 src/headerview.c:233 src/query_search.c:790
-#: src/rpop3.c:667 src/summaryview.c:2388
+#: src/rpop3.c:667 src/summaryview.c:2411
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1677,7 +1677,7 @@ msgstr "在相關欄位上自動加入下列電子郵件信箱："
 msgid "From:"
 msgstr "來源："
 
-#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:187
+#: src/compose.c:3237 src/headerview.c:58 src/prefs_template.c:205
 msgid "Subject:"
 msgstr "主旨："
 
@@ -1825,7 +1825,7 @@ msgstr "MIME 型態"
 #. S_COL_DATE
 #: src/compose.c:5288 src/mimeview.c:217 src/prefs_filter_edit.c:507
 #: src/prefs_summary_column.c:72 src/rpop3.c:418 src/select-keys.c:309
-#: src/summaryview.c:5255
+#: src/summaryview.c:5266
 msgid "Size"
 msgstr "大小"
 
@@ -1955,28 +1955,28 @@ msgstr "未輸入名稱與值。"
 msgid "Edit Person Data"
 msgstr "編輯人物資料"
 
-#: src/editaddress.c:578 src/importcsv.c:122
+#: src/editaddress.c:578 src/importcsv.c:123
 msgid "Display Name"
 msgstr "顯示名稱"
 
-#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:121
+#: src/editaddress.c:584 src/editaddress.c:588 src/importcsv.c:122
 msgid "Last Name"
 msgstr "姓"
 
-#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:120
+#: src/editaddress.c:585 src/editaddress.c:587 src/importcsv.c:121
 msgid "First Name"
 msgstr "名"
 
-#: src/editaddress.c:590 src/importcsv.c:123
+#: src/editaddress.c:590 src/importcsv.c:124
 msgid "Nick Name"
 msgstr "暱稱"
 
 #: src/editaddress.c:627 src/editaddress.c:677 src/editaddress.c:887
-#: src/editgroup.c:267 src/importcsv.c:124
+#: src/editgroup.c:267 src/importcsv.c:125
 msgid "E-Mail Address"
 msgstr "E-Mail 地址"
 
-#: src/editaddress.c:628 src/editaddress.c:686
+#: src/editaddress.c:628 src/editaddress.c:686 src/importcsv.c:127
 msgid "Alias"
 msgstr "別名"
 
@@ -2090,12 +2090,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:540 src/foldersel.c:597 src/folderview.c:2344
-#: src/folderview.c:2350
+#: src/editgroup.c:540 src/foldersel.c:601 src/folderview.c:2404
+#: src/folderview.c:2410
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:541 src/foldersel.c:598 src/folderview.c:2351
+#: src/editgroup.c:541 src/foldersel.c:602 src/folderview.c:2411
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2112,7 +2112,7 @@ msgid "Edit JPilot Entry"
 msgstr "編輯 JPilot 資料"
 
 #: src/editjpilot.c:289 src/editldap.c:349 src/editvcard.c:202
-#: src/importcsv.c:691 src/importldif.c:498 src/prefs_account_dialog.c:1863
+#: src/importcsv.c:696 src/importldif.c:498 src/prefs_account_dialog.c:1863
 #: src/prefs_common_dialog.c:2164
 msgid " ... "
 msgstr "..."
@@ -2305,197 +2305,203 @@ msgstr ""
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:402 src/folderview.c:1242 src/prefs_folder_item.c:235
+#: src/foldersel.c:402 src/folderview.c:1246 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:406 src/folderview.c:1248 src/prefs_folder_item.c:236
+#: src/foldersel.c:406 src/folderview.c:1252 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:410 src/folderview.c:1254 src/prefs_folder_item.c:238
+#: src/foldersel.c:410 src/folderview.c:1258 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:414 src/folderview.c:1260 src/prefs_folder_item.c:239
+#: src/foldersel.c:414 src/folderview.c:1264 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:418 src/folderview.c:1266 src/prefs_folder_item.c:237
+#: src/foldersel.c:418 src/folderview.c:1270 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:599 src/folderview.c:2348 src/folderview.c:2352
+#: src/foldersel.c:422 src/folderview.c:1276 src/prefs_common_dialog.c:2108
+#: src/prefs_folder_item.c:240 src/prefs_toolbar.c:68
+msgid "Junk"
+msgstr "垃圾郵件"
+
+#: src/foldersel.c:603 src/folderview.c:2408 src/folderview.c:2412
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:607 src/folderview.c:2362 src/folderview.c:2370
-#: src/folderview.c:2432
+#: src/foldersel.c:611 src/folderview.c:2422 src/folderview.c:2430
+#: src/folderview.c:2492
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:617 src/folderview.c:2381 src/folderview.c:2440
+#: src/foldersel.c:621 src/folderview.c:2441 src/folderview.c:2500
 #: src/query_search.c:1156
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:625 src/folderview.c:2388
+#: src/foldersel.c:629 src/folderview.c:2448
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
 
-#: src/folderview.c:253 src/folderview.c:276
+#: src/folderview.c:254 src/folderview.c:278
 msgid "/Create _new folder..."
 msgstr "/產生新的資料夾(_N)..."
 
-#: src/folderview.c:254 src/folderview.c:277 src/folderview.c:304
+#: src/folderview.c:255 src/folderview.c:279 src/folderview.c:307
 msgid "/_Rename folder..."
 msgstr "/重新命名資料夾(_R)..."
 
-#: src/folderview.c:255 src/folderview.c:278
+#: src/folderview.c:256 src/folderview.c:280
 msgid "/_Move folder..."
 msgstr "/移除資料夾(_M)..."
 
-#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:305
+#: src/folderview.c:257 src/folderview.c:281 src/folderview.c:308
 msgid "/_Delete folder"
 msgstr "/刪除資料夾(_D)"
 
-#: src/folderview.c:258 src/folderview.c:281
+#: src/folderview.c:259 src/folderview.c:283
+#, fuzzy
+msgid "/Empty _junk"
+msgstr "/清空刪除的郵件(_T)"
+
+#: src/folderview.c:260 src/folderview.c:284
 msgid "/Empty _trash"
 msgstr "/清空刪除的郵件(_T)"
 
-#: src/folderview.c:260 src/folderview.c:285 src/folderview.c:309
+#: src/folderview.c:262 src/folderview.c:288 src/folderview.c:312
 msgid "/_Check for new messages"
 msgstr "/檢查新郵件(_C)"
 
-#: src/folderview.c:262 src/folderview.c:287
+#: src/folderview.c:264 src/folderview.c:290
 msgid "/R_ebuild folder tree"
 msgstr "/重建資料夾結構(_E)"
 
-#: src/folderview.c:263 src/folderview.c:288 src/folderview.c:311
+#: src/folderview.c:265 src/folderview.c:291 src/folderview.c:314
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/顯示(_V)/更新郵件列表(_U)"
 
-#: src/folderview.c:265 src/folderview.c:290 src/folderview.c:313
+#: src/folderview.c:267 src/folderview.c:293 src/folderview.c:316
 #, fuzzy
 msgid "/Mar_k all read"
 msgstr "標記成已讀"
 
-#: src/folderview.c:266 src/folderview.c:291
+#: src/folderview.c:268 src/folderview.c:294
 #, fuzzy
 msgid "/Send _queued messages"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/folderview.c:268 src/folderview.c:293 src/folderview.c:315
+#: src/folderview.c:270 src/folderview.c:296 src/folderview.c:318
 msgid "/_Search messages..."
 msgstr "/尋找郵件(_S)"
 
-#: src/folderview.c:269 src/folderview.c:294 src/folderview.c:316
+#: src/folderview.c:271 src/folderview.c:297 src/folderview.c:319
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:283 src/folderview.c:307
+#: src/folderview.c:286 src/folderview.c:310
 msgid "/Down_load"
 msgstr "/下載(_L)"
 
-#: src/folderview.c:301
+#: src/folderview.c:304
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/預訂新聞群組(_B)"
 
-#: src/folderview.c:303
+#: src/folderview.c:306
 msgid "/_Remove newsgroup"
 msgstr "/移除新聞群組(_R)"
 
-#: src/folderview.c:340
+#: src/folderview.c:343
 msgid "Creating folder view...\n"
 msgstr "產生資料夾檢視...\n"
 
-#: src/folderview.c:422 src/prefs_common_dialog.c:1592
+#: src/folderview.c:425 src/prefs_common_dialog.c:1592
 msgid "New"
 msgstr "新的"
 
 #. S_COL_MARK
-#: src/folderview.c:438 src/prefs_common_dialog.c:1593
+#: src/folderview.c:441 src/prefs_common_dialog.c:1593
 #: src/prefs_filter_edit.c:511 src/prefs_summary_column.c:67
 #: src/quick_search.c:110
 msgid "Unread"
 msgstr "未讀的"
 
-#: src/folderview.c:454 src/prefs_common_dialog.c:1594
+#: src/folderview.c:457 src/prefs_common_dialog.c:1594
 msgid "Total"
 msgstr ""
 
-#: src/folderview.c:598
+#: src/folderview.c:602
 msgid "Setting folder info...\n"
 msgstr "設定資料夾...\n"
 
-#: src/folderview.c:599
+#: src/folderview.c:603
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:907 src/mainwindow.c:4140 src/setup.c:298
+#: src/folderview.c:911 src/mainwindow.c:4142 src/setup.c:298
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:911 src/mainwindow.c:4145 src/setup.c:303
+#: src/folderview.c:915 src/mainwindow.c:4147 src/setup.c:303
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/folderview.c:955
+#: src/folderview.c:959
 msgid "Rebuild folder tree"
 msgstr "重建資料夾結構"
 
-#: src/folderview.c:956
+#: src/folderview.c:960
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "準備重建資料夾。確定要繼續？"
 
-#: src/folderview.c:965
+#: src/folderview.c:969
 msgid "Rebuilding folder tree..."
 msgstr "重建資料夾結構中..."
 
-#: src/folderview.c:972
+#: src/folderview.c:976
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/folderview.c:1106
+#: src/folderview.c:1110
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1274 src/prefs_common_dialog.c:2108 src/prefs_toolbar.c:68
-msgid "Junk"
-msgstr "垃圾郵件"
-
-#: src/folderview.c:2005
+#: src/folderview.c:2065
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2220
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2188
+#: src/folderview.c:2248
 #, fuzzy, c-format
 msgid "Download all messages under '%s' ?"
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2191
+#: src/folderview.c:2251
 #, fuzzy
 msgid "Download all messages"
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2240
+#: src/folderview.c:2300
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2345
+#: src/folderview.c:2405
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2505,26 +2511,26 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2420
+#: src/folderview.c:2480
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2421
+#: src/folderview.c:2481
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2452 src/folderview.c:2460
+#: src/folderview.c:2512 src/folderview.c:2520
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2533
+#: src/folderview.c:2593
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2662
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2533,12 +2539,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2604
+#: src/folderview.c:2664
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2609
+#: src/folderview.c:2669
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2551,20 +2557,30 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2641 src/folderview.c:2647
+#: src/folderview.c:2701 src/folderview.c:2707
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2683
+#: src/folderview.c:2743
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2684
+#: src/folderview.c:2744
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2725
+#: src/folderview.c:2750
+#, fuzzy
+msgid "Empty junk"
+msgstr "不是垃圾郵件"
+
+#: src/folderview.c:2751
+#, fuzzy
+msgid "Delete all messages in the junk folder?"
+msgstr "您確定要清除所有被刪除的郵件？"
+
+#: src/folderview.c:2793
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2573,34 +2589,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2727
+#: src/folderview.c:2795
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2777
+#: src/folderview.c:2845
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2778
+#: src/folderview.c:2846
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2931
+#: src/folderview.c:2999
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2932
+#: src/folderview.c:3000
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2982
+#: src/folderview.c:3050
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2983
+#: src/folderview.c:3051
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2613,7 +2629,7 @@ msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
 #: src/headerview.c:212 src/query_search.c:791 src/rpop3.c:668
-#: src/summaryview.c:2391
+#: src/summaryview.c:2414
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -2693,120 +2709,120 @@ msgstr "選擇匯入檔案"
 msgid "Select importing file"
 msgstr "選擇匯入檔案"
 
-#: src/importcsv.c:151 src/importldif.c:122
+#: src/importcsv.c:153 src/importldif.c:122
 msgid "Please specify address book name and file to import."
 msgstr "請指定要匯入的通訊錄名稱與檔案"
 
-#: src/importcsv.c:154
+#: src/importcsv.c:156
 #, fuzzy
 msgid "Select and reorder CSV field names to import."
 msgstr "請選擇要匯入的 LDIF 欄位名稱並改名"
 
-#: src/importcsv.c:157 src/importldif.c:128
+#: src/importcsv.c:159 src/importldif.c:128
 msgid "File imported."
 msgstr "檔案已匯入"
 
-#: src/importcsv.c:513 src/importldif.c:317
+#: src/importcsv.c:518 src/importldif.c:317
 msgid "Please select a file."
 msgstr "請選擇檔案："
 
-#: src/importcsv.c:519 src/importldif.c:323
+#: src/importcsv.c:524 src/importldif.c:323
 msgid "Address book name must be supplied."
 msgstr "未指定通訊錄名稱"
 
-#: src/importcsv.c:528
+#: src/importcsv.c:533
 #, fuzzy
 msgid "Error reading CSV fields."
 msgstr "匯入 LDIF 欄位錯誤"
 
-#: src/importcsv.c:554
+#: src/importcsv.c:559
 #, fuzzy
 msgid "CSV file imported successfully."
 msgstr "LDIF 檔案匯入完成。"
 
-#: src/importcsv.c:616
+#: src/importcsv.c:621
 #, fuzzy
 msgid "Select CSV File"
 msgstr "選擇 vCard 檔案"
 
-#: src/importcsv.c:682 src/importldif.c:489
+#: src/importcsv.c:687 src/importldif.c:489
 msgid "File Name"
 msgstr "檔名"
 
-#: src/importcsv.c:700
+#: src/importcsv.c:705
 msgid "Comma-separated"
 msgstr ""
 
-#: src/importcsv.c:704
+#: src/importcsv.c:709
 msgid "Tab-separated"
 msgstr ""
 
-#: src/importcsv.c:735 src/importldif.c:530
+#: src/importcsv.c:740 src/importldif.c:530
 msgid "S"
 msgstr "S"
 
-#: src/importcsv.c:736
+#: src/importcsv.c:741
 #, fuzzy
 msgid "CSV Field"
 msgstr "LDIF 欄位"
 
-#: src/importcsv.c:737
+#: src/importcsv.c:742
 #, fuzzy
 msgid "Address Book Field"
 msgstr "通訊錄："
 
-#: src/importcsv.c:754
+#: src/importcsv.c:759
 msgid "Reorder address book fields with the Up and Down button."
 msgstr ""
 
-#: src/importcsv.c:789 src/prefs_actions.c:310 src/prefs_customheader.c:279
+#: src/importcsv.c:794 src/prefs_actions.c:310 src/prefs_customheader.c:279
 #: src/prefs_display_header.c:287 src/prefs_display_items.c:233
-#: src/prefs_summary_column.c:301
+#: src/prefs_summary_column.c:301 src/prefs_template.c:306
 msgid "Up"
 msgstr "向上"
 
-#: src/importcsv.c:791 src/prefs_actions.c:316 src/prefs_customheader.c:285
+#: src/importcsv.c:796 src/prefs_actions.c:316 src/prefs_customheader.c:285
 #: src/prefs_display_header.c:293 src/prefs_display_items.c:237
-#: src/prefs_summary_column.c:305
+#: src/prefs_summary_column.c:305 src/prefs_template.c:312
 msgid "Down"
 msgstr "向下"
 
-#: src/importcsv.c:833 src/importldif.c:653
+#: src/importcsv.c:838 src/importldif.c:653
 msgid "Address Book :"
 msgstr "通訊錄："
 
-#: src/importcsv.c:843 src/importldif.c:663
+#: src/importcsv.c:848 src/importldif.c:663
 msgid "File Name :"
 msgstr "檔名："
 
-#: src/importcsv.c:854 src/importldif.c:673
+#: src/importcsv.c:859 src/importldif.c:673
 msgid "Records :"
 msgstr "紀錄："
 
-#: src/importcsv.c:882
+#: src/importcsv.c:887
 #, fuzzy
 msgid "Import CSV file into Address Book"
 msgstr "將 LDIF 檔匯入通訊錄"
 
 #. Button panel
-#: src/importcsv.c:914 src/importldif.c:733 src/prefs_toolbar.c:74
+#: src/importcsv.c:919 src/importldif.c:733 src/prefs_toolbar.c:74
 msgid "Next"
 msgstr "下一封"
 
-#: src/importcsv.c:915 src/importldif.c:734 src/prefs_toolbar.c:77
+#: src/importcsv.c:920 src/importldif.c:734 src/prefs_toolbar.c:77
 msgid "Prev"
 msgstr "前一封"
 
-#: src/importcsv.c:947 src/importldif.c:766
+#: src/importcsv.c:952 src/importldif.c:766
 msgid "File Info"
 msgstr "檔案資訊"
 
-#: src/importcsv.c:948
+#: src/importcsv.c:953
 #, fuzzy
 msgid "Fields"
 msgstr "LDIF 欄位"
 
-#: src/importcsv.c:949 src/importldif.c:768
+#: src/importcsv.c:954 src/importldif.c:768
 msgid "Finish"
 msgstr "完成"
 
@@ -2986,7 +3002,7 @@ msgstr "離開"
 msgid "Retrieving message (%d / %d) (%s / %s)"
 msgstr "取得新郵件 (%d / %d) (%s / %s)"
 
-#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4648
+#: src/inc.c:1241 src/inc.c:1264 src/summaryview.c:4644
 msgid ""
 "Execution of the junk filter command failed.\n"
 "Please check the junk mail control setting."
@@ -3077,16 +3093,16 @@ msgstr "輸入密碼"
 msgid "Protocol log"
 msgstr "通訊協定紀錄"
 
-#: src/main.c:572
+#: src/main.c:575
 #, c-format
 msgid "Usage: %s [OPTION]...\n"
 msgstr "用法：%s [選項]...\n"
 
-#: src/main.c:575
+#: src/main.c:578
 msgid "  --compose [address]    open composition window"
 msgstr "  --compose [郵件地址]   直接開啟撰寫郵件視窗"
 
-#: src/main.c:576
+#: src/main.c:579
 msgid ""
 "  --attach file1 [file2]...\n"
 "                         open composition window with specified files\n"
@@ -3095,68 +3111,68 @@ msgstr ""
 "  --attach 檔案1 [檔案2]...\n"
 "                         開啟撰寫郵件視窗，並將指定的檔案附加上去"
 
-#: src/main.c:579
+#: src/main.c:582
 msgid "  --receive              receive new messages"
 msgstr "  --receive              直接接收新郵件"
 
-#: src/main.c:580
+#: src/main.c:583
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr "  --receive-all          直接接收所有帳號的新郵件"
 
-#: src/main.c:581
+#: src/main.c:584
 msgid "  --send                 send all queued messages"
 msgstr "  --send                 送出所有暫存資料夾中的郵件"
 
-#: src/main.c:582
+#: src/main.c:585
 msgid "  --status [folder]...   show the total number of messages"
 msgstr "  --status [資料夾]...   顯示資料夾內總共有多少郵件"
 
-#: src/main.c:583
+#: src/main.c:586
 msgid ""
 "  --status-full [folder]...\n"
 "                         show the status of each folder"
 msgstr "  --status-full [資料夾]...     顯示每個資料夾中有多少郵件"
 
-#: src/main.c:585
+#: src/main.c:588
 msgid "  --open folderid/msgnum open message in new window"
 msgstr ""
 
-#: src/main.c:586
+#: src/main.c:589
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
 
-#: src/main.c:588
+#: src/main.c:591
 msgid "  --ipcport portnum      specify port for IPC remote commands"
 msgstr ""
 
-#: src/main.c:590
+#: src/main.c:593
 #, fuzzy
 msgid "  --exit                 exit Sylpheed"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:591
+#: src/main.c:594
 msgid "  --debug                debug mode"
 msgstr "  --debug                除錯模式"
 
-#: src/main.c:592
+#: src/main.c:595
 msgid "  --help                 display this help and exit"
 msgstr "  --help                 顯示本說明並離開"
 
-#: src/main.c:593
+#: src/main.c:596
 msgid "  --version              output version information and exit"
 msgstr "  --version              顯示版本資訊"
 
-#: src/main.c:597
+#: src/main.c:600
 #, c-format
 msgid "Press any key..."
 msgstr ""
 
-#: src/main.c:728
+#: src/main.c:731
 msgid "Filename encoding"
 msgstr "檔案名稱編碼"
 
-#: src/main.c:729
+#: src/main.c:732
 msgid ""
 "The locale encoding is not UTF-8, but the environmental variable "
 "G_FILENAME_ENCODING is not set.\n"
@@ -3177,19 +3193,19 @@ msgstr ""
 "\n"
 "要繼續嗎？"
 
-#: src/main.c:768
+#: src/main.c:771
 msgid "Composing message exists. Really quit?"
 msgstr "有郵件正在編輯。確定要離開嗎？"
 
-#: src/main.c:779
+#: src/main.c:782
 msgid "Queued messages"
 msgstr "有未送出郵件"
 
-#: src/main.c:780
+#: src/main.c:783
 msgid "Some unsent messages are queued. Exit now?"
 msgstr "有些郵件正在暫存資料夾中尚未送出。確定要離開嗎？"
 
-#: src/main.c:888
+#: src/main.c:894
 msgid ""
 "GnuPG is not installed properly, or its version is too old.\n"
 "OpenPGP support disabled."
@@ -3197,20 +3213,20 @@ msgstr ""
 "GnuPG 並未安裝好，或版本過舊。\n"
 "關閉 OpenPGP 支援項目。"
 
-#: src/main.c:1121
+#: src/main.c:1127
 msgid "Loading plug-ins..."
 msgstr ""
 
 #. remote command mode
-#: src/main.c:1292
+#: src/main.c:1298
 msgid "another Sylpheed is already running.\n"
 msgstr "已經有 Sylpheed 程式正在執行中。\n"
 
-#: src/main.c:1574
+#: src/main.c:1580
 msgid "Migration of configuration"
 msgstr "設定資料轉移"
 
-#: src/main.c:1575
+#: src/main.c:1581
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
@@ -3562,15 +3578,15 @@ msgstr "/顯示(_V)/字元編碼(_E)/中文 (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:776 src/summaryview.c:468
+#: src/mainwindow.c:776 src/summaryview.c:472
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_W)"
 
-#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:470
+#: src/mainwindow.c:777 src/messageview.c:259 src/summaryview.c:474
 msgid "/_View/Mess_age source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_A)"
 
-#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:471
+#: src/mainwindow.c:778 src/messageview.c:260 src/summaryview.c:475
 #, fuzzy
 msgid "/_View/All _headers"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
@@ -3877,8 +3893,8 @@ msgstr "建立主視窗...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1211 src/summaryview.c:2540 src/summaryview.c:2627
-#: src/summaryview.c:4213 src/summaryview.c:4342 src/summaryview.c:4730
+#: src/mainwindow.c:1211 src/summaryview.c:2563 src/summaryview.c:2650
+#: src/summaryview.c:4209 src/summaryview.c:4338 src/summaryview.c:4726
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3946,7 +3962,7 @@ msgstr "Sylpheed - 資料夾檢視"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:422
+#: src/mainwindow.c:2551 src/mimeview.c:142 src/summaryview.c:426
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
@@ -3962,15 +3978,15 @@ msgstr "/回覆給原作者(_S)"
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2559 src/summaryview.c:429
+#: src/mainwindow.c:2559 src/summaryview.c:433
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2560 src/summaryview.c:430
+#: src/mainwindow.c:2560 src/summaryview.c:434
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2561 src/summaryview.c:431
+#: src/mainwindow.c:2561 src/summaryview.c:435
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
@@ -4017,22 +4033,22 @@ msgstr "您確定要離開嗎？"
 msgid "The selected messages could not be combined."
 msgstr ""
 
-#: src/mainwindow.c:3854
+#: src/mainwindow.c:3856
 #, fuzzy
 msgid "Select folder to open"
 msgstr "選擇資料夾"
 
-#: src/mainwindow.c:4028
+#: src/mainwindow.c:4030
 #, fuzzy
 msgid "Command line options"
 msgstr "未設定執行指令"
 
-#: src/mainwindow.c:4041
+#: src/mainwindow.c:4043
 #, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
 msgstr "用法：%s [選項]...\n"
 
-#: src/mainwindow.c:4049
+#: src/mainwindow.c:4051
 msgid ""
 "--compose [address]\n"
 "--attach file1 [file2]...\n"
@@ -4049,7 +4065,7 @@ msgid ""
 "--version"
 msgstr ""
 
-#: src/mainwindow.c:4066
+#: src/mainwindow.c:4068
 msgid ""
 "open composition window\n"
 "open composition window with specified files attached\n"
@@ -4066,15 +4082,15 @@ msgid ""
 "output version information and exit"
 msgstr ""
 
-#: src/mainwindow.c:4084
+#: src/mainwindow.c:4086
 msgid "Windows-only option:"
 msgstr ""
 
-#: src/mainwindow.c:4092
+#: src/mainwindow.c:4094
 msgid "--ipcport portnum"
 msgstr ""
 
-#: src/mainwindow.c:4097
+#: src/mainwindow.c:4099
 msgid "specify port for IPC remote commands"
 msgstr ""
 
@@ -4131,7 +4147,7 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:765 src/summaryview.c:3771
+#: src/messageview.c:765 src/summaryview.c:3767
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
@@ -4152,7 +4168,7 @@ msgstr "另存新檔(_S)..."
 msgid "/Save _all..."
 msgstr "全部存檔(_A)..."
 
-#: src/mimeview.c:140 src/summaryview.c:473
+#: src/mimeview.c:140 src/summaryview.c:477
 msgid "/_Print..."
 msgstr "/列印(_P)..."
 
@@ -4552,7 +4568,7 @@ msgstr ""
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:331
+#: src/prefs_account_dialog.c:1313 src/prefs_folder_item.c:332
 msgid "Automatically set the following addresses"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
@@ -4804,7 +4820,7 @@ msgstr " 語法說明 "
 msgid "Registered actions"
 msgstr "已加入之指令目錄"
 
-#: src/prefs_actions.c:423 src/prefs_template.c:326
+#: src/prefs_actions.c:423 src/prefs_template.c:373
 msgid "(New)"
 msgstr "（新）"
 
@@ -6181,28 +6197,28 @@ msgstr "MIME 型態"
 msgid "Normal"
 msgstr "正常"
 
-#: src/prefs_folder_item.c:247
+#: src/prefs_folder_item.c:248
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "在郵件列表中不要顯示郵件主旨前面的中括號 [] 或小括號 ()"
 
-#: src/prefs_folder_item.c:249
+#: src/prefs_folder_item.c:250
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回覆時刪除郵件主旨前面的中括號 [] 或小括號 ()"
 
-#: src/prefs_folder_item.c:289 src/prefs_folder_item.c:300
+#: src/prefs_folder_item.c:290 src/prefs_folder_item.c:301
 #: src/prefs_toolbar.c:98 src/progressdialog.c:91
 msgid "Account"
 msgstr "帳號"
 
-#: src/prefs_folder_item.c:329
+#: src/prefs_folder_item.c:330
 msgid "Apply to subfolders"
 msgstr "套用到子資料夾"
 
-#: src/prefs_folder_item.c:354
+#: src/prefs_folder_item.c:355
 msgid "use also on reply"
 msgstr "回覆郵件時也使用"
 
-#: src/prefs_folder_item.c:378 src/prefs_template.c:185
+#: src/prefs_folder_item.c:379 src/prefs_template.c:203
 msgid "Reply-To:"
 msgstr "回信地址："
 
@@ -6240,19 +6256,19 @@ msgstr "附加檔案"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:69 src/query_search.c:401 src/rpop3.c:415
-#: src/summaryview.c:5248
+#: src/summaryview.c:5259
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:70 src/query_search.c:402 src/rpop3.c:416
-#: src/summaryview.c:5251
+#: src/summaryview.c:5262
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:71 src/query_search.c:403 src/rpop3.c:417
-#: src/summaryview.c:5253
+#: src/summaryview.c:5264
 msgid "Date"
 msgstr "日期"
 
@@ -6262,7 +6278,7 @@ msgid "Number"
 msgstr "編號"
 
 #. S_COL_NUMBER
-#: src/prefs_summary_column.c:74 src/summaryview.c:5259
+#: src/prefs_summary_column.c:74 src/summaryview.c:5270
 #, fuzzy
 msgid "To"
 msgstr "收件人"
@@ -6284,43 +6300,61 @@ msgstr ""
 "選擇的項目會出現在郵件列表中。\n"
 "您可以用向上╱向下來更改順序，或直接用滑鼠拖曳這些選項。"
 
-#: src/prefs_template.c:164
+#: src/prefs_template.c:180
 msgid "Template name"
 msgstr "郵件樣板名稱"
 
-#: src/prefs_template.c:227
+#: src/prefs_template.c:248
 msgid "Register"
 msgstr "加入"
 
-#: src/prefs_template.c:233
+#: src/prefs_template.c:254
 msgid " Substitute "
 msgstr " 替換 "
 
-#: src/prefs_template.c:245
+#: src/prefs_template.c:266
 msgid " Symbols "
 msgstr " 符號 "
 
-#: src/prefs_template.c:259
+#: src/prefs_template.c:284
 msgid "Registered templates"
 msgstr "已紀錄之郵件樣板符號"
 
-#: src/prefs_template.c:281
+#: src/prefs_template.c:326
 msgid "Templates"
 msgstr "郵件樣板設定"
 
-#: src/prefs_template.c:402
+#: src/prefs_template.c:433
+#, fuzzy
+msgid "Template is modified"
+msgstr "郵件樣板名稱"
+
+#: src/prefs_template.c:434
+msgid "Current modification is not applied. Finish without saving it?"
+msgstr ""
+
+#: src/prefs_template.c:452
+#, fuzzy
+msgid "Templates are modified"
+msgstr "郵件樣板名稱"
+
+#: src/prefs_template.c:453
+msgid "Really discard modification to templates?"
+msgstr ""
+
+#: src/prefs_template.c:473
 msgid "Template"
 msgstr "郵件樣板"
 
-#: src/prefs_template.c:479
+#: src/prefs_template.c:552
 msgid "Template format error."
 msgstr "郵件樣板格式錯誤。"
 
-#: src/prefs_template.c:565
+#: src/prefs_template.c:641
 msgid "Delete template"
 msgstr "刪除郵件樣板"
 
-#: src/prefs_template.c:566
+#: src/prefs_template.c:642
 msgid "Do you really want to delete this template?"
 msgstr "您確定要刪除這個郵件樣板嗎？"
 
@@ -6569,7 +6603,7 @@ msgstr "過濾中..."
 msgid "Searching %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2312
+#: src/query_search.c:799 src/rpop3.c:676 src/summaryview.c:2335
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6677,7 +6711,7 @@ msgstr "關於"
 msgid "%s - POP3 Remote mailbox"
 msgstr "移除信箱"
 
-#: src/rpop3.c:414 src/summaryview.c:5257
+#: src/rpop3.c:414 src/summaryview.c:5268
 msgid "No."
 msgstr "No."
 
@@ -7247,7 +7281,7 @@ msgstr "無法取得收件人或收件新聞群組名單。"
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/subscribedialog.c:526 src/summaryview.c:913
+#: src/subscribedialog.c:526 src/summaryview.c:930
 msgid "Done."
 msgstr "完成"
 
@@ -7256,349 +7290,349 @@ msgstr "完成"
 msgid "%d newsgroups received (%s read)"
 msgstr "已接收 %d 個新聞群組 (%s 已讀)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:427
 msgid "/Repl_y to"
 msgstr "/回覆給(_Y)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:428
 msgid "/Repl_y to/_all"
 msgstr "/回覆給(_Y)/所有收件人(_A)"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:429
 msgid "/Repl_y to/_sender"
 msgstr "/回覆給(_Y)/原作者(_S)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:430
 msgid "/Repl_y to/mailing _list"
 msgstr "/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:437
 msgid "/M_ove..."
 msgstr "/移動(_O)..."
 
-#: src/summaryview.c:434
+#: src/summaryview.c:438
 msgid "/_Copy..."
 msgstr "/複製(_C)..."
 
-#: src/summaryview.c:436
+#: src/summaryview.c:440
 msgid "/_Mark"
 msgstr "/標記(_M)"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/_Mark/Set _flag"
 msgstr "/標記(_M)/標記(_M)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:442
 #, fuzzy
 msgid "/_Mark/_Unset flag"
 msgstr "/標記(_M)/去除標記(_U)"
 
-#: src/summaryview.c:439
+#: src/summaryview.c:443
 msgid "/_Mark/---"
 msgstr "/標記(_M)/---"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:444
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/標記(_M)/標記成未讀(_E)"
 
-#: src/summaryview.c:441
+#: src/summaryview.c:445
 msgid "/_Mark/Mark as rea_d"
 msgstr "/標記(_M)/標記成已讀(_D)"
 
-#: src/summaryview.c:443
+#: src/summaryview.c:447
 #, fuzzy
 msgid "/_Mark/Mark _thread as read"
 msgstr "/標記(_M)/標記成已讀(_D)"
 
-#: src/summaryview.c:445
+#: src/summaryview.c:449
 msgid "/_Mark/Mark all _read"
 msgstr "/標記(_M)/標記所有郵件成已讀(_R)"
 
-#: src/summaryview.c:446
+#: src/summaryview.c:450
 msgid "/Color la_bel"
 msgstr "/以顏色做標記(_B)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:454
 #, fuzzy
 msgid "/Set as _junk mail"
 msgstr "歸類為垃圾郵件"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:455
 #, fuzzy
 msgid "/Set as not j_unk mail"
 msgstr "歸類為垃圾郵件"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:457
 msgid "/Re-_edit"
 msgstr "/重新編輯(_E)"
 
-#: src/summaryview.c:455
+#: src/summaryview.c:459
 msgid "/Add sender to address boo_k..."
 msgstr "/將寄信人加入通訊錄(_K)..."
 
-#: src/summaryview.c:457
+#: src/summaryview.c:461
 msgid "/Create f_ilter rule"
 msgstr "/產生郵件過濾規則(_I)"
 
-#: src/summaryview.c:458
+#: src/summaryview.c:462
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/產生郵件過濾規則(_I)/自動產生(_A)"
 
-#: src/summaryview.c:460
+#: src/summaryview.c:464
 msgid "/Create f_ilter rule/by _From"
 msgstr "/產生郵件過濾規則(_I)/依來源(_F)"
 
-#: src/summaryview.c:462
+#: src/summaryview.c:466
 msgid "/Create f_ilter rule/by _To"
 msgstr "/產生郵件過濾規則(_I)/依收信人(_T)"
 
-#: src/summaryview.c:464
+#: src/summaryview.c:468
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/產生郵件過濾規則(_I)/依主旨(_S)"
 
-#: src/summaryview.c:496
+#: src/summaryview.c:500
 msgid "Creating summary view...\n"
 msgstr "正在建立彙總檢視...\n"
 
-#: src/summaryview.c:648
+#: src/summaryview.c:665
 #, fuzzy, c-format
 msgid "Scanning folder (%s) (%d)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:701
+#: src/summaryview.c:718
 msgid "Process mark"
 msgstr "郵件標記"
 
-#: src/summaryview.c:702
+#: src/summaryview.c:719
 msgid "Some marks are left. Process it?"
 msgstr "某些郵件已被標記。要繼續嗎？"
 
-#: src/summaryview.c:758
+#: src/summaryview.c:775
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:920
+#: src/summaryview.c:937
 #, fuzzy
 msgid "Could not establish a connection to the server."
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: src/summaryview.c:1507
+#: src/summaryview.c:1529
 msgid "_Search again"
 msgstr "再次搜尋(_S)"
 
-#: src/summaryview.c:1528 src/summaryview.c:1537
+#: src/summaryview.c:1551 src/summaryview.c:1560
 msgid "No more unread messages"
 msgstr "沒有其他未讀郵件"
 
-#: src/summaryview.c:1529
+#: src/summaryview.c:1552
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1531
+#: src/summaryview.c:1554
 msgid "No unread messages."
 msgstr "沒有未讀郵件。"
 
-#: src/summaryview.c:1538
+#: src/summaryview.c:1561
 #, fuzzy
 msgid "No unread message found. Go to next unread folder?"
 msgstr "沒有未讀郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1546 src/summaryview.c:1555
+#: src/summaryview.c:1569 src/summaryview.c:1578
 msgid "No more new messages"
 msgstr "沒有其他新郵件"
 
-#: src/summaryview.c:1547
+#: src/summaryview.c:1570
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1549
+#: src/summaryview.c:1572
 msgid "No new messages."
 msgstr "沒有新郵件。"
 
-#: src/summaryview.c:1556
+#: src/summaryview.c:1579
 #, fuzzy
 msgid "No new message found. Go to next folder which has new messages?"
 msgstr "沒有新郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1564 src/summaryview.c:1573
+#: src/summaryview.c:1587 src/summaryview.c:1596
 msgid "No more marked messages"
 msgstr "沒有其他已標記郵件"
 
-#: src/summaryview.c:1565
+#: src/summaryview.c:1588
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1567 src/summaryview.c:1576
+#: src/summaryview.c:1590 src/summaryview.c:1599
 msgid "No marked messages."
 msgstr "沒有已標記郵件。"
 
-#: src/summaryview.c:1574
+#: src/summaryview.c:1597
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1582 src/summaryview.c:1591
+#: src/summaryview.c:1605 src/summaryview.c:1614
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/summaryview.c:1583
+#: src/summaryview.c:1606
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1585 src/summaryview.c:1594
+#: src/summaryview.c:1608 src/summaryview.c:1617
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之郵件。"
 
-#: src/summaryview.c:1592
+#: src/summaryview.c:1615
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1939
+#: src/summaryview.c:1962
 msgid "Attracting messages by subject..."
 msgstr "依主旨展開郵件中..."
 
-#: src/summaryview.c:2133
+#: src/summaryview.c:2156
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:2137
+#: src/summaryview.c:2160
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:2138 src/summaryview.c:2143
+#: src/summaryview.c:2161 src/summaryview.c:2166
 msgid ", "
 msgstr "， "
 
-#: src/summaryview.c:2142
+#: src/summaryview.c:2165
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:2157
+#: src/summaryview.c:2180
 msgid " item(s) selected"
 msgstr " 封已選擇"
 
-#: src/summaryview.c:2179
+#: src/summaryview.c:2202
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:2183
+#: src/summaryview.c:2206
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:2219
+#: src/summaryview.c:2242
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2475
+#: src/summaryview.c:2498
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2477
+#: src/summaryview.c:2500
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2584
+#: src/summaryview.c:2607
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2946
+#: src/summaryview.c:2942
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:3018
+#: src/summaryview.c:3014
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:3231
+#: src/summaryview.c:3227
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:3296
+#: src/summaryview.c:3292
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:3324
+#: src/summaryview.c:3320
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:3325
+#: src/summaryview.c:3321
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:3401
+#: src/summaryview.c:3397
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:3439
+#: src/summaryview.c:3435
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3503
+#: src/summaryview.c:3499
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3535
+#: src/summaryview.c:3531
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3572
+#: src/summaryview.c:3568
 #, fuzzy
 msgid "Select folder to move"
 msgstr "選擇資料夾"
 
-#: src/summaryview.c:3602
+#: src/summaryview.c:3598
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3633
+#: src/summaryview.c:3629
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3669
+#: src/summaryview.c:3665
 #, fuzzy
 msgid "Select folder to copy"
 msgstr "選擇資料夾"
 
-#: src/summaryview.c:3814
+#: src/summaryview.c:3810
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:4120 src/summaryview.c:4121
+#: src/summaryview.c:4116 src/summaryview.c:4117
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:4271 src/summaryview.c:4272
+#: src/summaryview.c:4267 src/summaryview.c:4268
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4565 src/summaryview.c:4626
+#: src/summaryview.c:4561 src/summaryview.c:4622
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4691
+#: src/summaryview.c:4687
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4692
+#: src/summaryview.c:4688
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4737
+#: src/summaryview.c:4733
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2010-07-29 08:24:58 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2010-07-29 08:24:58 +0000
commit	df251dcecf8247c46e37c25696a5722240e53bb5 (patch)
tree	72eef7658b4cdc63c22fa619b8052f236636d717 /po
parent	0f1a9464181978dff13728f940f98c05fcbdb859 (diff)