updated po files.

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

30 files changed, 2597 insertions, 2484 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 01a58289..27df46b9 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2006-01-05
+
+	* updated hu.po and de.po.
+
 2005-12-27
 
 	* updated pt_BR.po.
diff --git a/po/bg.po b/po/bg.po
index b5545c5a..8daac456 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -514,16 +514,16 @@ msgstr "Папка"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr ""
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "не може да се отвори файлът с маркировките\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не може да се вземе съобщението %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невалиден команден ред за печат: `%s'\n"
@@ -964,10 +964,10 @@ msgid "/New _Folder"
 msgstr "/Нова _Папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1045,7 +1045,7 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
@@ -1179,7 +1179,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Папка"
@@ -1267,8 +1267,8 @@ msgstr "/_Добавяне"
 msgid "/_Remove"
 msgstr "/_Премахване"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Аксесоари..."
 
@@ -2045,12 +2045,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2218,173 +2218,173 @@ msgstr "Директория на спула"
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Създаване на _нова папка..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Преименуване на папка..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Преименуване на папка..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Изтриване на папка"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Проверка за нови съобщения"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/_Възобновяване дървото на папката"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Изглед/_Обновяване на извадката"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Търсене на съобщения..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Няма непрочетени съобщения."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Записване в новинарска група"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Премахване на новинарска група"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Създаване на изглед на папка...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Нови"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочетени"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Установяване информация за папка...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Установяване информация за папка..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Сканиране на папка %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Сканиране на папка %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Възобновяване дървото на папката"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дървото на папката ще бъде възобновено. Продължане?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Възобновяване дървото на папката..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Възобновяване на дървото на папката провалено."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Проверяване за нови съобщения във всички папки..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2394,24 +2394,37 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Изтриване на папка"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2419,21 +2432,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2442,34 +2455,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
diff --git a/po/cs.po b/po/cs.po
index e174dcb1..bc39aee2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2003-05-30 13:31GMT+0100\n"
 "Last-Translator: Radek Vybíral <Radek.Vybiral@vsb.cz>\n"
 "Language-Team: Czech <cs@li.org>\n"
@@ -517,16 +517,16 @@ msgstr "Složka"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Neúspěšná konverze kódu.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "nelze otevřít označený soubor\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nelze načíst zprávu %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatný příkazový řádek tisku: '%s'\n"
@@ -967,10 +967,10 @@ msgid "/New _Folder"
 msgstr "/Nová s_ložka"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1047,7 +1047,7 @@ msgstr ""
 "Chcete smazat složku '%s' A TAKÉ všechny adresy v ní? \n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Smazat složku "
 
@@ -1180,7 +1180,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Složka"
@@ -1268,8 +1268,8 @@ msgstr "/_Přidat..."
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -2047,12 +2047,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -2220,174 +2220,174 @@ msgstr "Spool adresář"
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "%c nemůže být obsaženo ve jméně složky."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvořit složku '%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/_Vytvořit novou složku..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Přej_menovat složku..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Přej_menovat složku..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Smazat složku"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Zkontrolovat nové zprávy"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovit strom složek"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Na_jít zprávy..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Při_hlásit diskusní skupinu..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Smazat d_iskusní skupinu"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Vytvářím náhled pro složku...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nová"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepřečtené"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Nastavuji informace o složce...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o složce..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohledávám složku %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohledávám složku %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom složek"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Provádím obnovu stromu složek..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Zjišťuji nové zprávy ve všech složkách..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Posílám zprávu"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Vyskytla se chyba při posílání zprávy na %s ."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2397,24 +2397,37 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít další\n"
 "podsložky, přidejte nakonec názvu '/')"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nové jméno pro '%s' :"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Smazat složku "
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2422,21 +2435,21 @@ msgstr ""
 "Všechny složky a zprávy v '%s' budou vymazány.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2445,34 +2458,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 účet '%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 účet"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Smazat účet pro diskuzní skupinu"
 
diff --git a/po/da.po b/po/da.po
index 3e81c98a..7dabd1ff 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -518,16 +518,16 @@ msgstr "Mappe"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Tegnsæt konverteringsfejl.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "kan ikke åbne markéret fil\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan ikke hente meddelelse %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\n"
@@ -968,10 +968,10 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -1177,7 +1177,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Mappe"
@@ -1265,8 +1265,8 @@ msgstr "/_Tilføj..."
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
@@ -2043,12 +2043,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2216,174 +2216,174 @@ msgstr "Spool sti"
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/_Opret ny mappe..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Omdøb mappe..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Omdøb mappe..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Slet mappe"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/G_endan mappe træ"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vis/_Opdatér oversigt"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Søg meddelelse..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ingen ulæste meddelelser."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Abonner på nyhedsgruppe..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Slet nyhedsgruppe"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Opretter mappe træ...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ulæst"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennemsøger mappe %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennemsøger mappe %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe træ"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe træ..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2393,24 +2393,37 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Slet mappe"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2418,21 +2431,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2441,34 +2454,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
diff --git a/po/de.po b/po/de.po
index 19475a6b..d7fa69f8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
-"PO-Revision-Date: 2005-11-19 08:34+0100\n"
-"Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"PO-Revision-Date: 2006-01-04 09:13+0100\n"
+"Last-Translator: Joo Martin <debian@joomart.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -518,16 +518,16 @@ msgstr "Spam-Mail Filter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "kann markierte Datei nicht öffnen\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kann Nachricht %d nicht holen\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Druck-Befehlszeile ist ungültig: `%s'\n"
@@ -969,10 +969,10 @@ msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1050,7 +1050,7 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
@@ -1183,7 +1183,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Ablage"
@@ -1271,8 +1271,8 @@ msgstr "/_Hinzufügen..."
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
@@ -2009,12 +2009,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2181,170 +2181,169 @@ msgstr "Wähle Verzeichnis"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/Ablage _verschieben..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Ablage _löschen"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Leere _Papierkorb"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten prüfen"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/A_blagebaum erneuern"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
-#, fuzzy
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 msgid "/_Update summary"
-msgstr "/_Ansicht/Akt_ualisiere Ablageninhalt"
+msgstr "/_Update Zusammenfassung"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Suche Nachrichten..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Herunterladen"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Newsgroup _abonnieren..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Erstelle Ablageansicht...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2354,24 +2353,37 @@ 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:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Ablage löschen"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2381,21 +2393,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2362
-#, fuzzy
+#: src/folderview.c:2380
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2404,34 +2415,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -3196,9 +3207,8 @@ msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Ansicht/_Zeichensatz/_Automatische Erkennung"
 
 #: src/mainwindow.c:603 src/messageview.c:172
-#, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
-msgstr "/_Ansicht/_Zeichensatz/West Europa (ISO-8859-15)"
+msgstr "/_Ansicht/_Zeichensatz/West Europa (Windows-1252)"
 
 #: src/mainwindow.c:643 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
@@ -4050,9 +4060,8 @@ msgid "days"
 msgstr "Tag(en)"
 
 #: src/prefs_account_dialog.c:869
-#, fuzzy
 msgid "0 days: remove immediately"
-msgstr "(0 Tage: sofort entfernen)"
+msgstr "0 Tage: sofort entfernen"
 
 #: src/prefs_account_dialog.c:879
 msgid "Download all messages on server"
@@ -4089,9 +4098,8 @@ msgid "Automatic"
 msgstr "Automatisch"
 
 #: src/prefs_account_dialog.c:957
-#, fuzzy
 msgid "Only check INBOX on receiving"
-msgstr "Nur bei manuellem Empfang"
+msgstr "Prüfe INBOX nur beim Empfang"
 
 #: src/prefs_account_dialog.c:959
 msgid "News"
@@ -4279,7 +4287,7 @@ msgstr "IMAP-Serververzeichnis."
 
 #: src/prefs_account_dialog.c:1683
 msgid "Only the subfolders of this directory will be displayed."
-msgstr ""
+msgstr "Nur die Unterablagen dieses Verzeichnisses werden angezeigt."
 
 #: src/prefs_account_dialog.c:1728
 msgid "Put sent messages in"
@@ -4290,9 +4298,8 @@ msgid "Put draft messages in"
 msgstr "Entwürfe speichern in"
 
 #: src/prefs_account_dialog.c:1732
-#, fuzzy
 msgid "Put queued messages in"
-msgstr "Gelöschte Nachrichten speichern in"
+msgstr "Nachrichten der Warteschlange speichern in"
 
 #: src/prefs_account_dialog.c:1734
 msgid "Put deleted messages in"
@@ -4328,7 +4335,7 @@ msgstr "Keinen NNTP-Server angegeben."
 
 #: src/prefs_account_dialog.c:1852
 msgid "Specified folder is not a queue folder."
-msgstr ""
+msgstr "Ausgewählte Ablage ist keine Warteschlangen-Ablage."
 
 #: src/prefs_account_dialog.c:1926
 msgid ""
@@ -4473,7 +4480,7 @@ msgstr "Spam-Mail"
 
 #: src/prefs_common_dialog.c:673
 msgid "Details"
-msgstr ""
+msgstr "Details"
 
 #: src/prefs_common_dialog.c:727
 msgid "Auto-check new mail"
@@ -4600,14 +4607,12 @@ msgid "Auto-save to draft"
 msgstr "Automatisch als Entwurf speichern"
 
 #: src/prefs_common_dialog.c:1093
-#, fuzzy
 msgid "Format"
-msgstr "Normal"
+msgstr "Format"
 
 #: src/prefs_common_dialog.c:1098
-#, fuzzy
 msgid "Spell checking"
-msgstr "Rechtschreibprüfung aktivieren"
+msgstr "Rechtschreibprüfung"
 
 #. reply
 #: src/prefs_common_dialog.c:1149
@@ -4636,9 +4641,8 @@ msgid "Default language:"
 msgstr "Standard-Sprache"
 
 #: src/prefs_common_dialog.c:1346
-#, fuzzy
 msgid "Text font"
-msgstr "Text"
+msgstr "Text Font"
 
 #. ---- Folder View ----
 #: src/prefs_common_dialog.c:1358
@@ -4692,14 +4696,12 @@ msgid "Default character encoding"
 msgstr "Standard-Zeichensatz"
 
 #: src/prefs_common_dialog.c:1468
-#, fuzzy
 msgid "This is used when displaying messages with missing character encoding."
 msgstr "Dies wird für Nachrichten mit fehlender Zeichenkodierung verwendet."
 
 #: src/prefs_common_dialog.c:1474
-#, fuzzy
 msgid "Outgoing character encoding"
-msgstr "Standard-Zeichensatz"
+msgstr "Standard-Zeichensatz beim Versenden"
 
 #: src/prefs_common_dialog.c:1488
 msgid ""
@@ -4901,9 +4903,8 @@ msgid "Other"
 msgstr "Weiteres"
 
 #: src/prefs_common_dialog.c:2098
-#, fuzzy
 msgid "External commands"
-msgstr "Befehl ausführen"
+msgstr "Externe Befehle"
 
 #: src/prefs_common_dialog.c:2146
 msgid "Receive dialog"
@@ -5022,9 +5023,8 @@ msgid "Western European (ISO-8859-15)"
 msgstr "Western European (ISO-8859-15"
 
 #: src/prefs_common_dialog.c:2480
-#, fuzzy
 msgid "Western European (Windows-1252)"
-msgstr "Western European (ISO-8859-15"
+msgstr "Western European (Windows-1252)"
 
 #: src/prefs_common_dialog.c:2484
 msgid "Central European (ISO-8859-2)"
@@ -5579,9 +5579,8 @@ msgid "Folder properties"
 msgstr "Ablage-Eigenschaften"
 
 #: src/prefs_folder_item.c:187
-#, fuzzy
 msgid "Identifier"
-msgstr "Steuerzeichen"
+msgstr "Kennzeichen"
 
 #: src/prefs_folder_item.c:219 src/subscribedialog.c:294
 msgid "Type"
@@ -6034,9 +6033,8 @@ msgid "unknown"
 msgstr "unbekannt"
 
 #: src/subscribedialog.c:481
-#, fuzzy
 msgid "Getting newsgroup list..."
-msgstr "Kann die Newsgroup-Liste nicht empfangen."
+msgstr "Hole Newsgroup-Liste..."
 
 #: src/subscribedialog.c:489
 msgid "Can't retrieve newsgroup list."
@@ -6064,47 +6062,42 @@ msgid "Match all of the following"
 msgstr "Wenn alle der folgenden Bedingungen zutreffen"
 
 #: src/summary_search.c:300
-#, fuzzy
 msgid "Folder:"
-msgstr "Ablage"
+msgstr "Ablage:"
 
 #: src/summary_search.c:318
-#, fuzzy
 msgid "Search subfolders"
-msgstr "Suche fehlgeschlagen"
+msgstr "Suche Unterablagen"
 
 #: src/summary_search.c:392
-#, fuzzy
 msgid "_Save as search folder"
-msgstr "Speichern in Entwurfablage"
+msgstr "_Speichern in Suchablage"
 
 #: src/summary_search.c:542
-#, fuzzy, c-format
+#, c-format
 msgid "Searching %s ..."
-msgstr "Durchsuche Ablage %s ..."
+msgstr "Suche %s ..."
 
 #: src/summary_search.c:570
-#, fuzzy, c-format
+#, c-format
 msgid "Searching %s (%d / %d)..."
-msgstr "Filtern..."
+msgstr "Suche %s (%d / %d)..."
 
 #: src/summary_search.c:649 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
 #: src/summary_search.c:831
-#, fuzzy
 msgid "Save as search folder"
-msgstr "Speichern in Entwurfablage"
+msgstr "Speichern in Suchablage"
 
 #: src/summary_search.c:852
 msgid "Location:"
-msgstr ""
+msgstr "Speicherort:"
 
 #: src/summary_search.c:867
-#, fuzzy
 msgid "Folder name:"
-msgstr "Dateiname"
+msgstr "Ablage Name:"
 
 #: src/summaryview.c:394
 msgid "/Repl_y to"
@@ -6409,9 +6402,9 @@ msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
 #: src/summaryview.c:3925 src/summaryview.c:3981
-#, fuzzy, c-format
+#, c-format
 msgid "Filtering (%d / %d)..."
-msgstr "Filtern..."
+msgstr "Filtern (%d / %d)..."
 
 #: src/summaryview.c:4030
 msgid "filtering..."
@@ -6483,98 +6476,3 @@ msgstr ""
 #: src/textview.c:2080
 msgid "Fake URL warning"
 msgstr "Falsche URL Warnung"
-
-#~ msgid "Body:"
-#~ msgstr "Nachricht:"
-
-#~ msgid "Find all"
-#~ msgstr "Finde alle"
-
-#~ msgid "Beginning of list reached; continue from end?"
-#~ msgstr "Anfang der Liste erreicht. Weiter vom Ende?"
-
-#~ msgid "End of list reached; continue from beginning?"
-#~ msgstr "Ende der Liste erreicht. Weiter vom Anfang?"
-
-#~ msgid "Outgoing encoding"
-#~ msgstr "Ausgehender Zeichensatz"
-
-#~ msgid "Quote"
-#~ msgstr "Zitat"
-
-#~ msgid "Spell"
-#~ msgstr "Rechtschreibprüfung"
-
-#~ msgid "Font"
-#~ msgstr "Schriftart"
-
-#~ msgid " [Edited]"
-#~ msgstr " [in Bearbeitung]"
-
-#, fuzzy
-#~ msgid "Fallback encoding"
-#~ msgstr "Dateiname Zeichensatz"
-
-#~ msgid "Terminated process group id: %d"
-#~ msgstr "Gruppen ID: %d des terminierten Prozesses"
-
-#~ msgid "Temporary file: %s"
-#~ msgstr "Temporäre Datei: %s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Verfassen: Eingabe vom Überwachungsprozess\n"
-
-#~ msgid "Couldn't exec external editor\n"
-#~ msgstr "Kann externen Editor nicht ausführen\n"
-
-#~ msgid "Couldn't write to file\n"
-#~ msgstr "Kann nicht in Datei schreiben\n"
-
-#~ msgid "Pipe read failed\n"
-#~ msgstr "Lesen von Pipe fehlgeschlagen\n"
-
-#~ msgid ""
-#~ "Filtered messages will be moved to the junk folder and deleted from the "
-#~ "server."
-#~ msgstr ""
-#~ "Gefilterte Nachrichten werden in die Spam-Mail Ablage verschoben und vom "
-#~ "Server gelöscht."
-
-#~ msgid ""
-#~ "Enter the print command line:\n"
-#~ "(`%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "Geben Sie den Druckbefehl ein:\n"
-#~ "('%s' wird durch den Dateinamen ersetzt)"
-
-#~ msgid ""
-#~ "First, you have to set the location of mailbox.\n"
-#~ "You can use existing mailbox in MH format\n"
-#~ "if you have the one.\n"
-#~ "If you're not sure, just select OK."
-#~ msgstr ""
-#~ "Zuerst muss der Ort der Mailbox gesetzt werden.\n"
-#~ "Sie können eine vorhandene Mailbox im MH-Format nutzen.\n"
-#~ "Wenn Sie sich nicht sicher sind, wählen Sie OK."
-
-#~ msgid ""
-#~ "Select the preset of key bindings.\n"
-#~ "You can also modify each menu's shortcuts by pressing\n"
-#~ "any key(s) when placing the mouse pointer on the item."
-#~ msgstr ""
-#~ "Wählen Sie die Voreinstellungen für die Abkürzungstasten.\n"
-#~ "Durch benutzen einer Tastekombination, wenn der Mauszeiger über einem "
-#~ "Menüeintrag\n"
-#~ "ist, können Sie die Abkürzungstastenkombination jedes Menüeintrags ändern."
-
-#~ msgid "Compose message%s"
-#~ msgstr "Verfasse Nachricht%s"
-
-#~ msgid "Translate header name (such as `From:', `Subject:')"
-#~ msgstr "Übersetze Kopfzeilennamen (wie 'Von:', 'Betreff:')"
-
-#~ msgid "Font selection"
-#~ msgstr "Schriftauswahl"
-
-#~ msgid "Empty messages in all trash?"
-#~ msgstr "Lösche alle Nachrichten in allen Papierkörben?"
diff --git a/po/el.po b/po/el.po
index 2665bc5f..847891a7 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2001-10-08\n"
 "Last-Translator: Michalis Kabrianis <Michalis@bigfoot.com>\n"
 "Language-Team: Greek <nls@tux.hellug.gr>\n"
@@ -523,16 +523,16 @@ msgstr "Κατάλογος"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "Η μετατροπή του κώδικα απέτυχε.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "δεν μπορώ να ανοίξω το αρχείο mark\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "δεν μπορώ να λάβω το μήνυμα %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Η εντολή εκτύπωσης είναι άκυρη: `%s'\n"
@@ -977,10 +977,10 @@ msgid "/New _Folder"
 msgstr "/Νέος κατάλογος"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1058,7 +1058,7 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
@@ -1185,7 +1185,7 @@ msgid "Group"
 msgstr "ΝέαΟμάδα"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Κατάλογος"
@@ -1275,8 +1275,8 @@ msgstr "/Προσθήκη..."
 msgid "/_Remove"
 msgstr "/Διαγραφή"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Ιδιότητες..."
@@ -2074,12 +2074,12 @@ msgstr "Επεξεργασία καταλόγου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -2252,183 +2252,183 @@ msgstr "Επιλογή καταλόγου"
 msgid "Select folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Sent"
 msgstr "Αποστολή"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 #, fuzzy
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Δημιουργία νέου καταλόγου..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Μετονομασία καταλόγου..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Μετονομασία καταλόγου..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Διαγραφή καταλόγου"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Απεικόνιση/Κωδικοσύνολο"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tΑναζήτηση στα απροσπέλαστα μηνύματα... "
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Συνδρομή σε newsgroup..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Διαγραφή newsgroup"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Δημιουργώ την απεικόνιση καταλόγων...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Νέα"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "αρ."
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Θέτω τις πληροφορίες καταλόγων...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Θέτω τις πληροφορίες καταλόγων..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Σάρωση καταλόγων %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Σάρωση καταλόγου %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/Ενημέρωση δομής καταλόγων"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ενημέρωση της δομής καταλόγων..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Σύνθεση νέου μηνύματος"
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ο κατάλογος %s είναι επιλεγμένος\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2438,24 +2438,37 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα κατάλογο για να βάλετε υποκαταλόγους\n"
 " προσθέστε το `/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Δώστε νέο όνομα για `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Μετονομασία καταλόγου"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Διαγραφή καταλόγου"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2463,21 +2476,21 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2486,35 +2499,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
diff --git a/po/es.po b/po/es.po
index 0ff02d43..402250d1 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2005-07-08 21:08+0100\n"
 "Last-Translator: Ricardo Mones <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones <mones@aic.uniovi.es>\n"
@@ -518,16 +518,16 @@ msgstr "Filtro de correo basura"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "no se puede abrir el fichero de marcas\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "no se puede obtener el mensaje %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden para imprimir es inválida: «%s»\n"
@@ -968,10 +968,10 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1048,7 +1048,7 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Carpeta"
@@ -1269,8 +1269,8 @@ msgstr "/_Añadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -2012,12 +2012,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2186,170 +2186,170 @@ msgstr "Seleccionar carpeta"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, 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:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/_Mover carpeta..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/_Vaciar papelera"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbol de carpetas"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Buscar en los mensajes"
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Des_cargar"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "No leídos"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Estableciendo información de carpeta...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Estableciendo información de carpeta..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Reconstruir árbol de carpetas"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruirá el árbol de carpetas. ¿Continuar?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el árbol de carpetas..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstrucción del árbol de carpetas falló."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Basura"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2359,24 +2359,37 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Borrar carpeta"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2386,21 +2399,21 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2409,34 +2422,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
diff --git a/po/et.po b/po/et.po
index f437b9cd..efd2610b 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -521,16 +521,16 @@ msgstr "Kaust"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Koodi muundamine ebaõnnestus.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "Ei suuda avada märgifaili\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ei suuda võtta kirja %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Trükkimise käsurida on vale: %s\n"
@@ -970,10 +970,10 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1050,7 +1050,7 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -1184,7 +1184,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Kaust"
@@ -1272,8 +1272,8 @@ msgstr "/Lis_a..."
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
@@ -2052,12 +2052,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2225,177 +2225,177 @@ msgstr "Kirja jada kataloog"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Loo uus kaust..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Nimeta kaust ümbe_r..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Kustuta kaust"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Otsi kirju..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Telli uudi_stegrupp..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Eemalda uudisteg_rupp"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Loon kausta vaate...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Kõigis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2405,24 +2405,37 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Kustuta kaust"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2430,21 +2443,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2453,34 +2466,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
diff --git a/po/fr.po b/po/fr.po
index dbe817fe..19cc1d83 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2005-08-08 23:57+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -529,16 +529,16 @@ msgstr "Dossier des messages indésirables"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): la conversion de code a échoué.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "Impossible d'ouvrir le fichier des marques\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossible de récupérer le message %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : « %s »\n"
@@ -980,10 +980,10 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1061,7 +1061,7 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1195,7 +1195,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Dossier"
@@ -1283,8 +1283,8 @@ msgstr "/_Ajouter..."
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Propriétés..."
 
@@ -2029,12 +2029,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2203,171 +2203,171 @@ msgstr "Choix d'un dossier"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, 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:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Créer un _nouveau dossier..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Renommer le dossier..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/_Déplacer le dossier..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Supprimer le dossier"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/_Vider la corbeille"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Re_chercher les nouveaux messages"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/Reconstruire l'_arborescence"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Affichage/Mettre à jo_ur le résumé des messages"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Rechercher dans le _dossier..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Té_lécharger"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Inscription aux groupes de discussion..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Supprimer le groupe de discussion"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Création de la vue des dossiers...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des données des dossiers...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Initialisation des données des dossiers..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va être reconstruite. Poursuivre ?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a échoué."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, 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:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2377,24 +2377,37 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Suppression de dossier"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2402,21 +2415,21 @@ msgstr ""
 "Tous les dossiers et messages sous « %s » vont être définitivement effacés.\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Impossible de supprimer le dossier « %s »."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2425,34 +2438,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:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
diff --git a/po/gl.po b/po/gl.po
index 9ee12d9a..a7dc8f06 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -518,16 +518,16 @@ msgstr "Carpeta"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversión de códigos fallida.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "no se pode abrir o ficheiro de marcas\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "non se pode obter o mensaxe %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresión non é válido: `%s'\n"
@@ -968,10 +968,10 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1048,7 +1048,7 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1183,7 +1183,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Carpeta"
@@ -1271,8 +1271,8 @@ msgstr "/_Engadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -2050,12 +2050,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2224,174 +2224,174 @@ msgstr "Directorio de almacén"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir árbre de carpetas"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Buscar nas mensaxes"
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Non hai mensaxes sin leer."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non leídos"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "Nº"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Establecendo información de carpeta...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Establecendo información de carpeta..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2401,24 +2401,37 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Borrar carpeta"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2426,21 +2439,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2449,34 +2462,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
diff --git a/po/hr.po b/po/hr.po
index 7d7c0c2b..8d5b5c31 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -524,16 +524,16 @@ msgstr "Spis"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obilježenu datoteku\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\n"
@@ -973,10 +973,10 @@ msgid "/New _Folder"
 msgstr "/Novi _spis"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1053,7 +1053,7 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Obriši spis"
 
@@ -1180,7 +1180,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Spis"
@@ -1269,8 +1269,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
@@ -2061,12 +2061,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2234,181 +2234,181 @@ msgstr "Spool direktorij"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, 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:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi spis..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Obriši spis"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Traži poruka..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Pribilježi se na _news grupu..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Ukloni news _grupu"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem spise %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem spis %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svježi stablo spisa"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvježavam stablo spisa..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove pošte"
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, 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:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2418,24 +2418,37 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Obriši spis"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2443,21 +2456,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2466,35 +2479,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
diff --git a/po/hu.po b/po/hu.po
index d97a91d9..4c7a2dd8 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2000 Free Software Foundation, Inc.
 # Székely Kriszitán <szekelyk@different.hu>, 2001.
 # Zahemszky Gábor <Gabor@Zahemszky.HU>, 2002, 2003, 2004.
-# Németh Tamás <ntomasz@vipmail.hu>, 2005.
+# Németh Tamás <ntomasz@vipmail.hu>, 2005, 2006.
 msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
-"PO-Revision-Date: 2005-07-04 17:05+0200\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
+"PO-Revision-Date: 2005-12-27 11:05+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
 "MIME-Version: 1.0\n"
@@ -38,29 +38,29 @@ msgid "Can't start TLS session.\n"
 msgstr "Nem lehet TLS menetet indítani.\n"
 
 #: libsylph/imap.c:1107
-#, fuzzy, c-format
+#, c-format
 msgid "Getting message %d"
-msgstr "%d üzenet törlése"
+msgstr "%d üzenet töltése"
 
 #: libsylph/imap.c:1224
-#, fuzzy, c-format
+#, c-format
 msgid "Appending messages to %s (%d / %d)"
-msgstr "Üzenet küldése (%d / %d bájt)"
+msgstr "Üzenetek hozzáfűzése ide: %s (%d / %d)"
 
 #: libsylph/imap.c:1316
-#, fuzzy, c-format
+#, c-format
 msgid "Moving messages %s to %s ..."
-msgstr "%s%c%d üzenet másolása %s-ba ...\n"
+msgstr "%s üzenetek áthelyezése ide: %s ..."
 
 #: libsylph/imap.c:1322
-#, fuzzy, c-format
+#, c-format
 msgid "Copying messages %s to %s ..."
-msgstr "%s%c%d üzenet másolása %s-ba ...\n"
+msgstr "%s üzenetek másolása ide: %s ..."
 
 #: libsylph/imap.c:1473
-#, fuzzy, c-format
+#, c-format
 msgid "Removing messages %s"
-msgstr "%s üzeneteinek fogadása..."
+msgstr "%s üzenetek eltávolítása"
 
 #: libsylph/imap.c:1479
 #, c-format
@@ -72,9 +72,9 @@ msgid "can't expunge\n"
 msgstr "nem lehet törölni\n"
 
 #: libsylph/imap.c:1570
-#, fuzzy, c-format
+#, c-format
 msgid "Removing all messages in %s"
-msgstr "%s üzeneteinek fogadása..."
+msgstr "Minden üzenet eltávolítása innen: %s?"
 
 #: libsylph/imap.c:1576
 msgid "can't set deleted flags: 1:*\n"
@@ -125,9 +125,9 @@ msgid "can't get envelope\n"
 msgstr "a borítékot nem lehet megszerezni\n"
 
 #: libsylph/imap.c:2324
-#, fuzzy, c-format
+#, c-format
 msgid "Getting message headers (%d / %d)"
-msgstr "Üzenet küldése (%d / %d bájt)"
+msgstr "Üzenetfejlécek töltése (%d / %d)"
 
 #: libsylph/imap.c:2334
 msgid "error occurred while getting envelope.\n"
@@ -158,9 +158,8 @@ msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 
 #: libsylph/imap.c:3125
-#, fuzzy
 msgid "error on imap command: STATUS\n"
-msgstr "hiba az IMAP parancs közben: CLOSE\n"
+msgstr "hiba az IMAP parancs közben: STATUS\n"
 
 #: libsylph/imap.c:3268
 msgid "IMAP4 authentication failed.\n"
@@ -173,7 +172,7 @@ msgstr "IMAP4 bejelentkezés sikertelen.\n"
 #: libsylph/imap.c:3621
 #, c-format
 msgid "can't append %s to %s\n"
-msgstr "%s hozzáfűzése %s-he(oö)z nem sikerült\n"
+msgstr "%s nem fűzhető hozzá ehhez: %s\n"
 
 #: libsylph/imap.c:3628
 msgid "(sending file...)"
@@ -182,12 +181,12 @@ msgstr "(fájl küldése...)"
 #: libsylph/imap.c:3657
 #, c-format
 msgid "can't append message to %s\n"
-msgstr "üzenet hozzáfűzése %s-he(oö)z nem sikerült\n"
+msgstr "üzenet nem fűzhető hozzá ehhez: %s\n"
 
 #: libsylph/imap.c:3689
 #, c-format
 msgid "can't copy %s to %s\n"
-msgstr "%s nem másolható %s-be/ba\n"
+msgstr "%s nem másolható ide: %s\n"
 
 #: libsylph/imap.c:3713
 #, c-format
@@ -205,12 +204,12 @@ msgstr "hiba az IMAP parancs közben: CLOSE\n"
 #: libsylph/imap.c:4007
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
-msgstr "az iconv nem tud UTF-7-ből %s-be/ba konvertálni\n"
+msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
 
 #: libsylph/imap.c:4037
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
-msgstr "az iconv nem tud %s-t UTF-7-re konvertálni\n"
+msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
 
 #: libsylph/mbox.c:50 libsylph/mbox.c:196
 msgid "can't write to temporary file\n"
@@ -219,7 +218,7 @@ msgstr "nem lehet az ideiglenes fájlba írni\n"
 #: libsylph/mbox.c:69
 #, c-format
 msgid "Getting messages from %s into %s...\n"
-msgstr "Üzenetek fogadása %s-ból %s-ba...\n"
+msgstr "Üzenetek fogadása innen: %s ide: %s...\n"
 
 #: libsylph/mbox.c:79
 msgid "can't read mbox file.\n"
@@ -519,16 +518,16 @@ msgstr "Levélszemét szűrő"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kód konverziós hiba.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "A kijelölt fájl nem nyitható meg\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d üzenet vétele nem sikerült\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Érvénytelen nyomtató parancs: `%s'\n"
@@ -972,10 +971,10 @@ msgid "/New _Folder"
 msgstr "/Ú_j Mappa"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1052,7 +1051,7 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -1181,7 +1180,7 @@ msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Mappa"
@@ -1269,8 +1268,8 @@ msgstr "/_Hozzáadás..."
 msgid "/_Remove"
 msgstr "/_Eltávolítás"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Tulajdonságok..."
 
@@ -1522,14 +1521,12 @@ msgid "/_Tools/PGP _Encrypt"
 msgstr "/_Eszközök/PGP _Titkosítás"
 
 #: src/compose.c:651
-#, fuzzy
 msgid "/_Tools/_Check spell"
-msgstr "/_Eszközök/_Futtatás"
+msgstr "/_Eszközök/_Helyesírásellenőrzés"
 
 #: src/compose.c:652
-#, fuzzy
 msgid "/_Tools/_Set spell language"
-msgstr "/_Eszközök/_Sablon"
+msgstr "/_Eszközök/Helyesírás _nyelvi beállítások"
 
 #: src/compose.c:892
 #, c-format
@@ -1583,7 +1580,7 @@ msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
 #: src/compose.c:2478
-#, fuzzy, c-format
+#, c-format
 msgid "%s - Compose%s"
 msgstr "%s - Üzenet írása%s"
 
@@ -1804,14 +1801,13 @@ msgid "External editor command line is invalid: `%s'\n"
 msgstr "Külső szerkesztő parancssora érvénytelen: `%s'\n"
 
 #: src/compose.c:5464
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process (pid: %d)?\n"
 msgstr ""
 "A külső szerkesztő még dolgozik.\n"
-"Processz kilövése?\n"
-"processz csoport azonosító: %d"
+"A processz kényszerített kilövése (pid: %d)?\n"
 
 #: src/compose.c:5839 src/compose.c:5847 src/compose.c:5853
 msgid "Can't queue the message."
@@ -2011,12 +2007,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2176,178 +2172,176 @@ msgid "Overwrite existing file?"
 msgstr "Létező fájl felülírása?"
 
 #: src/filesel.c:159
-#, fuzzy
 msgid "Select directory"
-msgstr "Mappa választása"
+msgstr "Könyvtár választása"
 
 #: src/foldersel.c:230
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Új _mappa létrehozása..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Mappa át_nevezése..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/Mappa át_helyezése..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Mappa _törlése"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/_Kuka ürítése"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Ú_j üzenetek ellenőrzése"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/_Mappafa újraépítése"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
-#, fuzzy
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 msgid "/_Update summary"
-msgstr "/_Nézet/Ö_sszegzés frissítése"
+msgstr "/Ö_sszegzés frissítése"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Ü_zenetek keresése..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Le_töltés"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Hírcsoport _előfizetése..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Hírcsoport e_ltávolítása"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Mappa nézet létrehozása...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Új"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Mappa információ beállítása...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Mappa információ beállítása..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa átvizsgálása..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa átvizsgálása..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Mappafa újraépítése"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A mappafa újra fog épülni. Folytatja?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa újraépítése..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa újraépítése sikertelen."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Új üzenetek keresése minden mappában..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Üzenetek letöltése %s mappába ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hiba lépett fel a(z) %s mappába történő üzenetek letöltése közben."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2357,24 +2351,37 @@ 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:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Mappa törlése"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2384,21 +2391,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "`%s' nem távolítható el."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2362
-#, fuzzy
+#: src/folderview.c:2380
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2407,34 +2413,34 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(Az üzenetek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -2576,14 +2582,13 @@ msgid "Finish"
 msgstr "Vége"
 
 #: src/inc.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Sylpheed: %d new messages"
-msgstr "Vége (%d új üzenet)"
+msgstr "Sylpheed: %d új üzenet"
 
 #: src/inc.c:164
-#, fuzzy
 msgid "Sylpheed"
-msgstr "Régi Sylpheed"
+msgstr "Sylpheed"
 
 #: src/inc.c:371
 msgid "Retrieving new messages"
@@ -2840,11 +2845,12 @@ msgstr ""
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
 msgstr ""
+"  --configdir dirname    azon könyvtár megadása, amelyben a konfigurációs "
+"fájlokat tárolja"
 
 #: src/main.c:375
-#, fuzzy
 msgid "  --exit                 exit Sylpheed"
-msgstr "  --debug                hibakereső üzemmód"
+msgstr "  --exit                kilépés a Sylpheedből"
 
 #: src/main.c:376
 msgid "  --debug                debug mode"
@@ -3073,9 +3079,8 @@ msgid "/_View/_Sort/by _date"
 msgstr "/_Nézet/_Rendezés/_Dátum szerint"
 
 #: src/mainwindow.c:536
-#, fuzzy
 msgid "/_View/_Sort/by t_hread date"
-msgstr "/_Nézet/_Rendezés/_Dátum szerint"
+msgstr "/_Nézet/_Rendezés/_Szál dátuma szerint"
 
 #: src/mainwindow.c:537
 msgid "/_View/_Sort/by _from"
@@ -3199,9 +3204,8 @@ msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/_Nézet/_Karakterkódolás/_Automatikus felismerés"
 
 #: src/mainwindow.c:603 src/messageview.c:172
-#, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
-msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (ISO-8859-15)"
+msgstr "/_Nézet/_Karakterkódolás/Nyugat-Európai (Windows-1252)"
 
 #: src/mainwindow.c:643 src/messageview.c:205
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
@@ -3538,7 +3542,6 @@ msgid "Empty all trash"
 msgstr "Kuka ürítése"
 
 #: src/mainwindow.c:1601
-#, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "Minden üzenet törlése a kukából?"
 
@@ -3547,14 +3550,13 @@ msgid "Add mailbox"
 msgstr "Postaláda hozzáadása"
 
 #: src/mainwindow.c:1630
-#, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
 "scanned automatically."
 msgstr ""
-"Kérem a postaláda helyét!\n"
-"Ha már létezik a postaláda, akkor\n"
+"Kérem adja meg a postaláda helyét!\n"
+"Ha létező postaládát ad meg, akkor\n"
 "automatikusan átvizsgálom."
 
 #: src/mainwindow.c:1636 src/setup.c:49
@@ -3768,7 +3770,7 @@ msgstr "Csatolások"
 
 #: src/messageview.c:371
 msgid "Message View - Sylpheed"
-msgstr ""
+msgstr "Üzenetnézet - Sylpheed"
 
 #: src/messageview.c:669 src/summaryview.c:3131
 #, c-format
@@ -3777,12 +3779,11 @@ msgstr "`%s' fájlt nem lehet elmenteni."
 
 #: src/messageview.c:728 src/summaryview.c:3154
 msgid "The message will be printed with the following command:"
-msgstr ""
+msgstr "Az üzenet a következő paranccsal lesz kinyomtatva:"
 
 #: src/messageview.c:729 src/summaryview.c:3155
-#, fuzzy
 msgid "(Default print command)"
-msgstr "Tanítás parancs:"
+msgstr "(Alapértelmezett nyomtatási parancs)"
 
 #: src/messageview.c:731 src/prefs_common_dialog.c:2300 src/summaryview.c:3157
 msgid "Print"
@@ -3814,9 +3815,8 @@ msgid "/_Save as..."
 msgstr "/Menté_s másként..."
 
 #: src/mimeview.c:132
-#, fuzzy
 msgid "/Save _all..."
-msgstr "/Menté_s másként..."
+msgstr "/M_inden mentése..."
 
 #: src/mimeview.c:135
 msgid "/_Check signature"
@@ -3869,9 +3869,8 @@ msgid "Can't save the part of multipart message."
 msgstr "Egy többrészes üzenet egy darabja nem menthető."
 
 #: src/mimeview.c:1050
-#, fuzzy
 msgid "Can't save the attachments."
-msgstr "`%s' fájlt nem lehet elmenteni."
+msgstr "A csatolás(ok)at nem lehet elmenteni."
 
 #: src/mimeview.c:1103
 msgid "Open with"
@@ -3888,7 +3887,7 @@ msgstr ""
 
 #: src/mimeview.c:1142
 msgid "Opening executable file"
-msgstr ""
+msgstr "Futtatható fájl megnyitása"
 
 #: src/mimeview.c:1143
 msgid ""
@@ -3897,6 +3896,10 @@ msgid ""
 "If you want to launch it, save it to somewhere and make sure it is not an "
 "virus or something like a malicious program."
 msgstr ""
+"Ez egy futtatható fájl. A futttható fájlok megnyitása biztonságig okokból "
+"korlátozott.\n"
+"Ha futtatni akarja, mentse el valahová, és győződjön meg róla, hogy nem egy "
+"vírus vagy más kártékony program."
 
 #: src/mimeview.c:1179
 #, c-format
@@ -4056,9 +4059,8 @@ msgid "days"
 msgstr "nap"
 
 #: src/prefs_account_dialog.c:869
-#, fuzzy
 msgid "0 days: remove immediately"
-msgstr "(0 nap: azonnal eltávolítani)"
+msgstr "0 nap: azonnal eltávolítani"
 
 #: src/prefs_account_dialog.c:879
 msgid "Download all messages on server"
@@ -4095,9 +4097,8 @@ msgid "Automatic"
 msgstr "Automatikus"
 
 #: src/prefs_account_dialog.c:957
-#, fuzzy
 msgid "Only check INBOX on receiving"
-msgstr "Csak kézi fogadáskor"
+msgstr "Csak az INBOX ellenőrzése fogadáskor"
 
 #: src/prefs_account_dialog.c:959
 msgid "News"
@@ -4284,7 +4285,7 @@ msgstr "IMAP szerver könyvtár"
 
 #: src/prefs_account_dialog.c:1683
 msgid "Only the subfolders of this directory will be displayed."
-msgstr ""
+msgstr "Csak ezen könyvtár almappái fognak megjelenni."
 
 #: src/prefs_account_dialog.c:1728
 msgid "Put sent messages in"
@@ -4295,9 +4296,8 @@ msgid "Put draft messages in"
 msgstr "Vázlatok elhelyezése"
 
 #: src/prefs_account_dialog.c:1732
-#, fuzzy
 msgid "Put queued messages in"
-msgstr "Törölt üzenetek elhelyezése"
+msgstr "Várakozó üzenetek elhelyezése itt"
 
 #: src/prefs_account_dialog.c:1734
 msgid "Put deleted messages in"
@@ -4333,7 +4333,7 @@ msgstr "Nincs megadott NNTP szerver."
 
 #: src/prefs_account_dialog.c:1852
 msgid "Specified folder is not a queue folder."
-msgstr ""
+msgstr "A megadott mappa nem egy várakozó mappa."
 
 #: src/prefs_account_dialog.c:1926
 msgid ""
@@ -4481,7 +4481,7 @@ msgstr "Levélszemét"
 
 #: src/prefs_common_dialog.c:673
 msgid "Details"
-msgstr ""
+msgstr "Részletek"
 
 #: src/prefs_common_dialog.c:727
 msgid "Auto-check new mail"
@@ -4515,7 +4515,7 @@ msgstr "Parancs"
 #: src/prefs_common_dialog.c:780
 #, c-format
 msgid "`%d' will be replaced with the number of new messages."
-msgstr "`%d' lesz helyettesítve az új üzenetek számával."
+msgstr "A `%d' helyére az új üzenetek száma kerül."
 
 #: src/prefs_common_dialog.c:784
 msgid "Incorporate from local spool"
@@ -4603,18 +4603,16 @@ msgid "Wrap before sending"
 msgstr "Sortördelés küldés előtt"
 
 #: src/prefs_common_dialog.c:1068
-#, fuzzy
 msgid "Auto-save to draft"
-msgstr "Mentés a vázlat mappába"
+msgstr "Automatikus mentés a vázlat mappába"
 
 #: src/prefs_common_dialog.c:1093
-#, fuzzy
 msgid "Format"
-msgstr "Normális"
+msgstr "Formátum"
 
 #: src/prefs_common_dialog.c:1098
 msgid "Spell checking"
-msgstr ""
+msgstr "Helyesírásellenőrzés"
 
 #. reply
 #: src/prefs_common_dialog.c:1149
@@ -4636,32 +4634,28 @@ msgstr " Szimbólumok leírása "
 
 #: src/prefs_common_dialog.c:1267
 msgid "Enable Spell checking"
-msgstr ""
+msgstr "Helyesírásellenőrzés bekapcsolása"
 
 #: src/prefs_common_dialog.c:1279
-#, fuzzy
 msgid "Default language:"
-msgstr "Alapértelmezett bejövő postafiók"
+msgstr "Alapértelmezett nyelv:"
 
 #: src/prefs_common_dialog.c:1346
-#, fuzzy
 msgid "Text font"
-msgstr "Szöveg"
+msgstr "Szöveg betűkészlete"
 
 #. ---- Folder View ----
 #: src/prefs_common_dialog.c:1358
-#, fuzzy
 msgid "Folder View"
-msgstr "Mappa"
+msgstr "Mappanézet"
 
 #: src/prefs_common_dialog.c:1366
 msgid "Display unread number next to folder name"
 msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
 
 #: src/prefs_common_dialog.c:1368
-#, fuzzy
 msgid "Display message number columns in the folder view"
-msgstr "Mappanév mellett az olvasatlan levelek számának kijelzése"
+msgstr "Mappanézetben jelenítse meg az üzenet számainak oszlopát"
 
 #: src/prefs_common_dialog.c:1377
 msgid "Abbreviate newsgroups longer than"
@@ -4698,18 +4692,18 @@ msgid "Message"
 msgstr "Üzenet"
 
 #: src/prefs_common_dialog.c:1454
-#, fuzzy
 msgid "Default character encoding"
-msgstr "/_Nézet/_Karakterkódolás"
+msgstr "Alapértelmezett karakterkódolás"
 
 #: src/prefs_common_dialog.c:1468
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
+"Ezt használja a program olyan üzenetek megjelenítéséhez, amiben nincs "
+"megadva 'character encoding' sor."
 
 #: src/prefs_common_dialog.c:1474
-#, fuzzy
 msgid "Outgoing character encoding"
-msgstr "/_Nézet/_Karakterkódolás"
+msgstr "Kimenő üzenetek karakterkódolása"
 
 #: src/prefs_common_dialog.c:1488
 msgid ""
@@ -4792,9 +4786,8 @@ msgid "Learning command:"
 msgstr "Tanítás parancs:"
 
 #: src/prefs_common_dialog.c:1780
-#, fuzzy
 msgid "(Select preset)"
-msgstr "Kulcs választás"
+msgstr "(Beállítás választás)"
 
 #: src/prefs_common_dialog.c:1805
 msgid "Not Junk"
@@ -4809,6 +4802,8 @@ msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
+"A levélszemét automatikus osztályozásánál, egy bizonyos mértékig kézzel kell "
+"tanítani a levélszemét és a levél válogatását."
 
 #: src/prefs_common_dialog.c:1841
 msgid "Junk folder"
@@ -4825,13 +4820,12 @@ msgid "Filter messages classified as junk on receiving"
 msgstr "A fogadáskor megszűrt üzenetek levélszemétként osztályozva"
 
 #: src/prefs_common_dialog.c:1873
-#, fuzzy
 msgid "Delete junk mails from server on receiving"
-msgstr "Törlés a szerverről"
+msgstr "Levélszemét törlése a szerverről fogadáskor"
 
 #: src/prefs_common_dialog.c:1877
 msgid "Mark filtered junk mails as read"
-msgstr ""
+msgstr "Szűrt jelölés a levélszemétre olvasáskor"
 
 #: src/prefs_common_dialog.c:1918
 msgid "Automatically check signatures"
@@ -4903,9 +4897,8 @@ msgid "Other"
 msgstr "Egyéb"
 
 #: src/prefs_common_dialog.c:2098
-#, fuzzy
 msgid "External commands"
-msgstr "Parancs futtatása"
+msgstr "Külső parancsok"
 
 #: src/prefs_common_dialog.c:2146
 msgid "Receive dialog"
@@ -4970,9 +4963,8 @@ msgstr "Web böngésző"
 
 #: src/prefs_common_dialog.c:2284 src/prefs_common_dialog.c:3771
 #: src/prefs_common_dialog.c:3792
-#, fuzzy
 msgid "(Default browser)"
-msgstr "Alapértelmezett bejövő postafiók"
+msgstr "(Alapértelmezett böngésző)"
 
 #: src/prefs_common_dialog.c:2337
 msgid "Use external program for incorporation"
@@ -5025,9 +5017,8 @@ msgid "Western European (ISO-8859-15)"
 msgstr "Nyugat Európai (ISO-8859-15)"
 
 #: src/prefs_common_dialog.c:2480
-#, fuzzy
 msgid "Western European (Windows-1252)"
-msgstr "Nyugat Európai (ISO-8859-15)"
+msgstr "Nyugat Európai (Windows-1252)"
 
 #: src/prefs_common_dialog.c:2484
 msgid "Central European (ISO-8859-2)"
@@ -5312,9 +5303,8 @@ msgid "Key bindings"
 msgstr "Billentyű hozzárendelések"
 
 #: src/prefs_common_dialog.c:3269
-#, fuzzy
 msgid "Select the preset of key bindings."
-msgstr " Billentyű hozzárendelések... "
+msgstr "Válasszon a beállított billentyű hozzárendelésekből."
 
 #: src/prefs_common_dialog.c:3279 src/prefs_common_dialog.c:3603
 msgid "Default"
@@ -5583,9 +5573,8 @@ msgid "Folder properties"
 msgstr "Mappa tulajdonságai"
 
 #: src/prefs_folder_item.c:187
-#, fuzzy
 msgid "Identifier"
-msgstr "Vezérlőjel"
+msgstr "Azonosító"
 
 #: src/prefs_folder_item.c:219 src/subscribedialog.c:294
 msgid "Type"
@@ -5886,14 +5875,12 @@ msgid "Mailbox setting"
 msgstr "Postaláda beállítások"
 
 #: src/setup.c:44
-#, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
 "If you are unsure, just select OK."
 msgstr ""
-"Kérem a postaláda helyét!\n"
-"Ha már létezik a postaláda, akkor\n"
-"automatikusan átvizsgálom."
+"Kérem adja meg a postaláda helyét!\n"
+"Ha bizonytalan, csak válassza az OK-ot."
 
 #: src/sigstatus.c:116
 msgid "Signature check result"
@@ -6025,9 +6012,8 @@ msgid "unknown"
 msgstr "ismeretlen"
 
 #: src/subscribedialog.c:481
-#, fuzzy
 msgid "Getting newsgroup list..."
-msgstr "Nem lehet olvasni a hírcsoportok listáját."
+msgstr "Hírcsoport lista letöltése..."
 
 #: src/subscribedialog.c:489
 msgid "Can't retrieve newsgroup list."
@@ -6055,47 +6041,42 @@ msgid "Match all of the following"
 msgstr "Minden egyezik a következőkből"
 
 #: src/summary_search.c:300
-#, fuzzy
 msgid "Folder:"
-msgstr "Mappa"
+msgstr "Mappa:"
 
 #: src/summary_search.c:318
-#, fuzzy
 msgid "Search subfolders"
-msgstr "Keresés sikertelen"
+msgstr "Almappák keresése"
 
 #: src/summary_search.c:392
-#, fuzzy
 msgid "_Save as search folder"
-msgstr "Mentés a vázlat mappába"
+msgstr "_Mentés, mint keresési mappa"
 
 #: src/summary_search.c:542
-#, fuzzy, c-format
+#, c-format
 msgid "Searching %s ..."
-msgstr "%s mappa átvizsgálása..."
+msgstr "%s keresése..."
 
 #: src/summary_search.c:570
-#, fuzzy, c-format
+#, c-format
 msgid "Searching %s (%d / %d)..."
-msgstr "Szűrés..."
+msgstr "%s keresése (%d / %d)..."
 
 #: src/summary_search.c:649 src/summaryview.c:1920
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
 #: src/summary_search.c:831
-#, fuzzy
 msgid "Save as search folder"
-msgstr "Mentés a vázlat mappába"
+msgstr "Mentés, mint keresési mappa"
 
 #: src/summary_search.c:852
 msgid "Location:"
-msgstr ""
+msgstr "Hely:"
 
 #: src/summary_search.c:867
-#, fuzzy
 msgid "Folder name:"
-msgstr "Fájlnév"
+msgstr "Mappanév:"
 
 #: src/summaryview.c:394
 msgid "/Repl_y to"
@@ -6162,29 +6143,24 @@ msgid "/Add sender to address boo_k..."
 msgstr "/Küldő hozzáadása a cím_jegyzékhez..."
 
 #: src/summaryview.c:422
-#, fuzzy
 msgid "/Create f_ilter rule"
-msgstr "/_Eszközök/_Szűrési szabályok"
+msgstr "/Szűrési szabály _létrehozása"
 
 #: src/summaryview.c:423
-#, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
-msgstr "/_Eszközök/_Szűrési szabályok/_Automatikusan"
+msgstr "/_Szűrési szabály _létrehozása/_Automatikusan"
 
 #: src/summaryview.c:425
-#, fuzzy
 msgid "/Create f_ilter rule/by _From"
-msgstr "/_Eszközök/_Szűrési szabályok/_Feladó alapján"
+msgstr "/Szűrési szabály _létrehozása/_Feladó alapján"
 
 #: src/summaryview.c:427
-#, fuzzy
 msgid "/Create f_ilter rule/by _To"
-msgstr "/_Eszközök/_Szűrési szabályok/_Címzett alapján"
+msgstr "/Szűrési szabály létrehozása/_Címzett alapján"
 
 #: src/summaryview.c:429
-#, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
-msgstr "/_Eszközök/_Szűrési szabályok/_Tárgy alapján"
+msgstr "/Szűrési szabály _létrehozása/_Tárgy alapján"
 
 #: src/summaryview.c:435
 msgid "/_View/_Source"
@@ -6405,9 +6381,9 @@ msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
 #: src/summaryview.c:3925 src/summaryview.c:3981
-#, fuzzy, c-format
+#, c-format
 msgid "Filtering (%d / %d)..."
-msgstr "Szűrés..."
+msgstr "Szűrés (%d / %d)..."
 
 #: src/summaryview.c:4030
 msgid "filtering..."
@@ -6478,121 +6454,3 @@ msgstr ""
 #: src/textview.c:2080
 msgid "Fake URL warning"
 msgstr "Hamis URL figyelmeztetés"
-
-#~ msgid "Body:"
-#~ msgstr "Törzs:"
-
-#~ msgid "Find all"
-#~ msgstr "Mindet keres"
-
-#~ msgid "Beginning of list reached; continue from end?"
-#~ msgstr "A lista elejére értem. Folytassam a végéről?"
-
-#~ msgid "End of list reached; continue from beginning?"
-#~ msgstr "A lista végére értem. Folytassam az elejéről?"
-
-#~ msgid "Outgoing encoding"
-#~ msgstr "Kimenők karakterkódolása"
-
-#~ msgid "Quote"
-#~ msgstr "Idézet"
-
-#~ msgid "Font"
-#~ msgstr "Betűkészlet"
-
-#~ msgid " [Edited]"
-#~ msgstr " [Szerkesztett]"
-
-#, fuzzy
-#~ msgid "Fallback encoding"
-#~ msgstr "Fájlnév karakterkódolása"
-
-#~ msgid "Terminated process group id: %d"
-#~ msgstr "A leállított processz csoport azonosítója: %d"
-
-#~ msgid "Temporary file: %s"
-#~ msgstr "Ideiglenes fájl: %s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "Szerkesztés: bemenet a monitorozó processzből\n"
-
-#~ msgid "Couldn't exec external editor\n"
-#~ msgstr "Külső szerkesztő nem indítható\n"
-
-#~ msgid "Couldn't write to file\n"
-#~ msgstr "Nem lehet a fájlba írni\n"
-
-#~ msgid "Pipe read failed\n"
-#~ msgstr "Hiba történt a csővezeték olvasása közben\n"
-
-#~ msgid ""
-#~ "Filtered messages will be moved to the junk folder and deleted from the "
-#~ "server."
-#~ msgstr ""
-#~ "A megszűrt üzenetek a levélszemét mappába kerülnek át, és a törlésre "
-#~ "kerülnek a szerverről."
-
-#~ msgid ""
-#~ "Enter the print command line:\n"
-#~ "(`%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "Adja meg a nyomtatási parancsot:\n"
-#~ "(`%s' helyére a fájlnév kerül)"
-
-#~ msgid ""
-#~ "First, you have to set the location of mailbox.\n"
-#~ "You can use existing mailbox in MH format\n"
-#~ "if you have the one.\n"
-#~ "If you're not sure, just select OK."
-#~ msgstr ""
-#~ "Először a postaláda helyét kell megadni!\n"
-#~ "Használhat egy létező MH formátumú postaládát is.\n"
-#~ "Ha bizonytalan, válassza az OK-t!"
-
-#~ msgid ""
-#~ "Select the preset of key bindings.\n"
-#~ "You can also modify each menu's shortcuts by pressing\n"
-#~ "any key(s) when placing the mouse pointer on the item."
-#~ msgstr ""
-#~ "Billentyű hozzárendelés előválasztó beállítása.\n"
-#~ "Módosíthatod minden menü gyorsbillentyűjét, ha az egérmutatóval\n"
-#~ "rámutatva megnyomod a kívánt billentyűt."
-
-#~ msgid "Compose message%s"
-#~ msgstr "Üzenet írása%s"
-
-#~ msgid "Translate header name (such as `From:', `Subject:')"
-#~ msgstr "Fejléc fordítása (mint `Feladó:', `Tárgy:')"
-
-#~ msgid "Font selection"
-#~ msgstr "Betűtípus választás"
-
-#~ msgid "Empty messages in all trash?"
-#~ msgstr "Minden üzenet törlése a kukából?"
-
-#~ msgid "Yes"
-#~ msgstr "Igen"
-
-#~ msgid "+No"
-#~ msgstr "+Nem"
-
-#~ msgid "Discard message"
-#~ msgstr "Üzenet elvetése"
-
-#~ msgid "Discard"
-#~ msgstr "Elvet"
-
-#~ msgid "to Draft"
-#~ msgstr "Vázlatok közé"
-
-#~ msgid "can't write headers\n"
-#~ msgstr "fejléc nem írható\n"
-
-#~ msgid "External program"
-#~ msgstr "Külső program"
-
-#~ msgid "Local spool"
-#~ msgstr "Helyi tároló"
-
-#~ msgid "Sending queued message %d failed.\n"
-#~ msgstr "%d üzenet küldése sikertelen a tárolóból.\n"
diff --git a/po/it.po b/po/it.po
index b0a017be..fd58e7ce 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2005-12-15 19:09+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -518,16 +518,16 @@ msgstr "Filtro mail spazzatura"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "Impossibile aprire il file delle segnature\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossibile prelevare il messaggio %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non è valida: «%s»\n"
@@ -970,10 +970,10 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1051,7 +1051,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -1184,7 +1184,7 @@ msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Cartella"
@@ -1272,8 +1272,8 @@ msgstr "/_Aggiungi..."
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Proprietà..."
 
@@ -2015,12 +2015,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2188,169 +2188,169 @@ msgstr "Selezione directory"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/_Sposta cartella..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Elimina cartella"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Svuo_ta cestino"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Controllo nuovi messaggi"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/R_icostruisci l'albero cartella"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 msgid "/_Update summary"
 msgstr "/A_ggiorna sommario"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Ricerca _messaggi..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Sc_arica"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Iscrizione newsgroup..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Rimuovi newsgroup..."
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "Tot."
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sarà ricostruito. Continuo?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella è fallita."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2360,24 +2360,37 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Elimina la cartella"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2388,20 +2401,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2410,34 +2423,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
diff --git a/po/ja.po b/po/ja.po
index 0972ce70..785c9377 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -517,16 +517,16 @@ msgstr "迷惑メールフィルタ"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): コード変換に失敗しました。\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "マークファイルを開けません\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "メッセージ %d を取り込めません\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "印刷のコマンドラインが無効です: `%s'\n"
@@ -967,10 +967,10 @@ msgid "/New _Folder"
 msgstr "/新規フォルダ(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1047,7 +1047,7 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
@@ -1178,7 +1178,7 @@ msgid "Group"
 msgstr "グループ"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "フォルダ"
@@ -1266,8 +1266,8 @@ msgstr "/追加(_A)..."
 msgid "/_Remove"
 msgstr "/削除(_R)"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/プロパティ(_P)..."
 
@@ -2004,12 +2004,12 @@ msgstr "フォルダの編集"
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -2176,169 +2176,169 @@ msgstr "ディレクトリの選択"
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "受信箱"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "送信控"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "送信待ち"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/新規フォルダを作成(_N)..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/フォルダ名を変更(_R)..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/フォルダを移動(_M)..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/フォルダを削除(_D)"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/ごみ箱を空にする(_T)"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/新着メッセージをチェック(_C)"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/フォルダツリーを再構築(_E)"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 msgid "/_Update summary"
 msgstr "/サマリを更新(_U)"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/メッセージを検索(_S)..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/ダウンロード(_L)"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/ニュースグループを購読(_B)..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/ニュースグループを削除(_R)"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "フォルダビューを作成中...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "新着"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未読"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "総数"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "フォルダ情報を設定中...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "フォルダ情報を設定中..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "フォルダをスキャン中 (%s%c%s) ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "フォルダツリーの再構築"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "フォルダツリーを再構築します。続けますか?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "フォルダツリーを再構築中..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "フォルダツリーの再構築に失敗しました。"
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "全フォルダの新着メッセージをチェック中..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2348,47 +2348,62 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "フォルダ `%s' を移動できません。"
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+"検索フォルダ '%s' は削除されます。\n"
+"実際のメッセージは削除されません。\n"
+"本当に削除しますか?"
+
+#: src/folderview.c:2300
+msgid "Delete search folder"
+msgstr "検索フォルダの削除"
+
+#: src/folderview.c:2305
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"`%s' 以下のすべてのフォルダとメッセージは完全に削除されます。\n"
+"'%s' 以下のすべてのフォルダとメッセージは完全に削除されます。\n"
 "復旧させることはできません。\n"
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2325
+#: src/folderview.c:2337 src/folderview.c:2343
 #, c-format
-msgid "Can't remove the folder `%s'."
-msgstr "フォルダ `%s' を削除できません。"
+msgid "Can't remove the folder '%s'."
+msgstr "フォルダ '%s' を削除できません。"
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2397,34 +2412,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
diff --git a/po/ko.po b/po/ko.po
index f053e14d..58c7516a 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -521,16 +521,16 @@ msgstr "폴더"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 코드 변환이 실패했습니다.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "표시 파일을 열수가 없습니다\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "메시지 %d를 가져올 수가 없습니다\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "인쇄 명령어가 올바르지않습니다: `%s'\n"
@@ -959,10 +959,10 @@ msgid "/New _Folder"
 msgstr "/새 폴더(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1039,7 +1039,7 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
@@ -1167,7 +1167,7 @@ msgid "Group"
 msgstr "그룹"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "폴더"
@@ -1255,8 +1255,8 @@ msgstr "/추가(_A)..."
 msgid "/_Remove"
 msgstr "/삭제(_R)"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/특성(_P)..."
@@ -2034,12 +2034,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2207,174 +2207,174 @@ msgstr "스풀 디렉토리"
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/새 폴더 만들기(_n)..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/폴더 이름 바꾸기(_R)..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/폴더 지우기(_D)"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/새 메시지 확인(_C)"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/폴더 트리 갱신(_e)"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/보기(_V)/요약 갱신(_U)"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/메시지 찾기(_S)..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/뉴스그룹 구독(_b)..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/뉴스그룹 삭제(_R)"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "폴더 뷰를 생성합니다...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "새것"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "안읽음"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "전체"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "폴더 정보를 설정합니다...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "폴더 정보를 설정합니다..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s를 스캔합니다..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s 폴더를 스캔합니다..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "폴더 트리 갱신"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "폴더 트리를 갱신합니다..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2384,24 +2384,37 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "폴더 삭제"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2409,21 +2422,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2432,34 +2445,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
diff --git a/po/lt.po b/po/lt.po
index 887bb806..57a8e025 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -518,16 +518,16 @@ msgstr "Nereikalingo pašto filtras"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "negali atidaryti žymų bylos\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "negaliu gauti žinutės %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Bloga spausdinimo komanda: „%s“\n"
@@ -967,10 +967,10 @@ msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1047,7 +1047,7 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
@@ -1175,7 +1175,7 @@ msgid "Group"
 msgstr "Grupė"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Katalogas"
@@ -1263,8 +1263,8 @@ msgstr "/Pri_dėti..."
 msgid "/_Remove"
 msgstr "/_Pašalinti"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Savybės..."
 
@@ -2004,12 +2004,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2177,170 +2177,170 @@ msgstr "Pasirinkti katalogą"
 msgid "Select folder"
 msgstr "Pasirinkti katalogą"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Gaunami"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Išsiųsti"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Eilė"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NaujasKatalodas"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Sukurti _naują katalogą..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Pe_rvadinti katalogą..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/Per_kelti katalogą..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Iš_trinti katalogą"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Išvaly_ti šiukšlinę"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Patikrinti paštą"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/P_erkurti katalogų medį"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Rodyti/Atna_ujinti santrauką"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/I_eškoti žinučių"
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/_Atsisiųsti"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Prisijungti prie naujienų grupės"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Paša_linti naujienų grupę"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Sukuriama katalogų peržiūra...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nauji"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nesk."
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Nustatoma katalogo informacija...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas “%s%c%s“..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas „%s“..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Perkurti katalogų medį"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Bus perkurtas katalogų medis. Tęsti?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Perkuriamas katalogų medis..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Katalogų medžio perkūrimas nepavyko."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinamos naujos žinutės visuose kataloguose..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Siunčiamos žinutės („%s“)..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida siunčiant žinutes („%s“)."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2350,24 +2350,37 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Ištrinti katalogą"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2377,21 +2390,21 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2400,34 +2413,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
diff --git a/po/nl.po b/po/nl.po
index 137e9156..de710630 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -526,16 +526,16 @@ msgstr "Accounts"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Opdracht voor het afdrukken in onjuist: '%s'\n"
@@ -979,10 +979,10 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1060,7 +1060,7 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -1193,7 +1193,7 @@ msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Accounts"
@@ -1281,8 +1281,8 @@ msgstr "/_Toevoegen..."
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
@@ -2060,12 +2060,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2234,174 +2234,174 @@ msgstr "Map voor de lokale mail"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/_Nieuwe map maken..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Map ver_wijderen"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/B_eeld/_Verversen"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Berichten _doorzoeken..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Geen ongelezen berichten."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/A_bonneren op een nieuwsgroep..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Nieuws_groep verwijderen"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2411,24 +2411,37 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Verwijder map"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2436,21 +2449,21 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2459,34 +2472,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
diff --git a/po/pl.po b/po/pl.po
index 34cebf25..8aed8876 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2005-03-05 18:57+0100\n"
 "Last-Translator: Wit Wilinski <madman at linux dot bydg dot org>\n"
 "Language-Team: POLISH <pl@li.org>\n"
@@ -512,16 +512,16 @@ msgstr "Niechciana poczta"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): Błąd konwersji kodu.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "nie można otworzyć pliku zaznaczeń\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nie można pobrać wiadomości %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Błędny wiersz polecenia wydruku: \"%s\"\n"
@@ -964,10 +964,10 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1045,7 +1045,7 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -1180,7 +1180,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Katalog"
@@ -1268,8 +1268,8 @@ msgstr "/Dod_aj..."
 msgid "/_Remove"
 msgstr "/_Usuń"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Właściwości..."
 
@@ -2011,12 +2011,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2184,171 +2184,171 @@ msgstr "Wybierz katalog"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Utwórz _nowy katalog..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Zmień nazwę katalogu..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Zmień nazwę katalogu..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Usuń katalog"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Opróżnij śmie_tnik"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Sprawdź nowe wiadomoś_ci"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/Odbuduj drz_ewo katalogów"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Widok/_Odśwież podsumowanie"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Wy_szukaj wiadomości..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Pobierz"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Subskrybuj grupę news..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Usuń g_rupę news"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Tworzenie widoku katalogów...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalogów"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalogów zostnie przebudowane. Kontynuować?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalogów..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Błąd podczas odbudowywania drzewa katalogów."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2358,24 +2358,37 @@ 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:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Usuń katalog"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2383,21 +2396,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2406,34 +2419,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index a1e99c15..4068c7fa 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-27 18:23+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2005-12-26 12:27-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -968,10 +968,10 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Pasta"
@@ -1269,8 +1269,8 @@ msgstr "/_Adicionar"
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
@@ -2009,12 +2009,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2183,169 +2183,169 @@ msgstr "Selecionar diretório"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, 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:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/_Mover pasta..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Apagar pasta"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Esvaziar _lixeira"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Buscar novas mensagens"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 msgid "/_Update summary"
 msgstr "/A_tualizar sumário"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Procurar mensagens..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/_Baixar"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Assinar grupo de notícias..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo de notícias"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Criando visualizador de pasta...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Não lido"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Configurando informações da pasta...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Configurando informações da pasta..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar árvore de pastas"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A árvore de pastas será reconstruída. Continuar?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Falha ao tentar reconstruir a árvore de pastas."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,24 +2355,37 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Apagar pasta"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2382,20 +2395,20 @@ msgstr ""
 "\n"
 "Quer realmente apagar?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2404,34 +2417,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
diff --git a/po/ro.po b/po/ro.po
index 56b501fe..4b60d3da 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -528,16 +528,16 @@ msgstr "Director"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "Convertirea codului a eşuat.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "deschiderea fişierului de marcaje este imposibilă\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "mesajul %d nu a putut fi recepţionat\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comandă pentru imprimare este invalidă: '%s'\n"
@@ -986,10 +986,10 @@ msgid "/New _Folder"
 msgstr "/_Director nou"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1067,7 +1067,7 @@ msgstr ""
 "adreselor conţinute de el ? Dacă ştergeţi doar directorul, adresele\n"
 "vor fi mutate in directorul părinte."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Ştergere director"
 
@@ -1202,7 +1202,7 @@ msgid "Group"
 msgstr "Groupă"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Director"
@@ -1290,8 +1290,8 @@ msgstr "/_Adăugare..."
 msgid "/_Remove"
 msgstr "/Ş_tergere"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Proprietăţi..."
@@ -2076,12 +2076,12 @@ msgstr "Editare director"
 msgid "Input the new name of folder:"
 msgstr "Introduceţi noul nume al directorului:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Director nou"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Introduceţi numele noului director:"
 
@@ -2251,185 +2251,185 @@ msgstr "Director spool"
 msgid "Select folder"
 msgstr "Selectare director"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Sent"
 msgstr "Trimitere"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Lista de aşteptare"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 #, fuzzy
 msgid "Drafts"
 msgstr "Salvare"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 #, fuzzy
 msgid "NewFolder"
 msgstr "Director nou"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele directorului."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Directorul '%s' există deja."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 #, fuzzy
 msgid "/Create _new folder..."
 msgstr "/Creare director _nou"
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 #, fuzzy
 msgid "/_Rename folder..."
 msgstr "/_Redenumire director"
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Căutare _director..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Ştergere _director"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "/_Fişier/_Curăţare gunoi"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vedere/Ar_bore"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\tCăutare mesaje nestocate... "
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nu există mesaje necitite"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/În_scriere la newsgroup"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Şte_rgere newsgroup"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Creare mod vedere director...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nou"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Setare informaţii despre director...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Setare informaţii despre director..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare director %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare director %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/R_escanare directoare"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Scanare directoare..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "/Verificare _mesaje noi"
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Directorul %s este selectat\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Trimitere mesaj"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2439,24 +2439,37 @@ msgstr ""
 "(dacă doriţi crearea de subdirectoare in acest director,\n"
 " adăugaţi un `/' la sfârşitul numelui)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceţi noul nume pentru '%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Redenumire director"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Ştergere director"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2464,21 +2477,21 @@ msgstr ""
 "Toate directoarele şi mesajele din '%s' vor fi şterse.\n"
 "Doriţi într-adevăr să continuaţi ?"
 
-#: src/folderview.c:2325
+#: src/folderview.c:2337 src/folderview.c:2343
 #, fuzzy, c-format
-msgid "Can't remove the folder `%s'."
+msgid "Can't remove the folder '%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr ""
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2487,35 +2500,35 @@ msgstr ""
 "Sunteţi sigur că doriţi să ştergeţi cutia poştală '%s'\n"
 "(Mesajele NU sunt şterse de pe disc)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului IMAP4 '%s' ?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Ştergere cont IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea newsgroupului '%s' ?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Ştergere newsgroup"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului de news '%s' ?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Ştergere cont de news"
 
diff --git a/po/ru.po b/po/ru.po
index 03e6f8d4..be345c2e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -516,16 +516,16 @@ msgstr "папку:"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Ошибка преобразования кодировки.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "ошибка открытия файла пометок\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не удалось получить сообщение %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Неправильная команда печати: '%s'\n"
@@ -968,10 +968,10 @@ msgid "/New _Folder"
 msgstr "/Новая папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1048,7 +1048,7 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Группа"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Папка"
@@ -1270,8 +1270,8 @@ msgstr "/Добавить..."
 msgid "/_Remove"
 msgstr "/Удалить"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/Свойства..."
 
@@ -2040,12 +2040,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2214,171 +2214,171 @@ msgstr "Выбор папки"
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ '%c' не может входить в имя папки."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка '%s' уже существует."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку '%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Создать новую папку..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Переименовать папку..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Переименовать папку..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Удалить папку"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Очистить корзину"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Проверить новые сообщения"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/Перестроить дерево папок"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Вид/Обновить список сообщений"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Поиск сообщений..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Загрузить"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Подписка на группу новостей..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Удалить группу новостей"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Создание области просмотра папок...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Новые"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочитанные"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Установка информации о папке...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Установка информации о папке..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Просмотр папки %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Просмотр папки %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Перестроить дерево папок"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок будет перестроено. Продолжить?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Перестройка дерева папок..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ошибка при перестройке дерева папок."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Проверка новых сообщений во всех папках..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из '%s'."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2388,24 +2388,37 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте '/' в конец имени)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для '%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Удалить папку"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2413,21 +2426,21 @@ msgstr ""
 "Все вложенные папки и сообщения из '%s' будут удалены.\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2436,34 +2449,34 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учетную запись IMAP4 '%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Удалить учетную запись IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей '%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учетную запись новостей '%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Удалить учетную запись новостей"
 
diff --git a/po/sk.po b/po/sk.po
index f6d2708a..2293177d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -516,16 +516,16 @@ msgstr "Priečinok"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepodarilo sa skonvertovať kód.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "nemôžem otvoriť súbor so značkami\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nedá sa prijať správa %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Príkazový riadok tlače je neplatný: '%s'\n"
@@ -966,10 +966,10 @@ msgid "/New _Folder"
 msgstr "/Nový _Priečinok"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1046,7 +1046,7 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Priečinok"
@@ -1269,8 +1269,8 @@ msgstr "/_Pridať..."
 msgid "/_Remove"
 msgstr "/_Odstrániť"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -2048,12 +2048,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2222,173 +2222,173 @@ msgstr "Spoolovací priečinok"
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Vytvoriť _nový priečinok..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Premenovať priečinok..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Premenovať priečinok..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Zmazať priečinok"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/P_rijať nové správy"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnoviť štruktúru priečinkov"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Zobraziť/_Aktualizovať zoznam"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Vy_hľadať v správach..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Žiadne neprečítané správy."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prih_lásiť sa do diskusnej skupiny"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Odstrániť _diskusnú skupinu"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Vytváram náhľad pre priečinok...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nový"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Neprečítané"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Nastavujem informácie o priečinku...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Nastavujem informácie o priečinku..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prehľadávam priečinok %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prehľadávam priečinok %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Obnoviť strom priečinkov"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom priečinkov bude obnovený. Pokračovať?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom priečinku..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu priečinku sa nepodarila."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2398,24 +2398,37 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Odstrániť priečinok"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2423,21 +2436,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2446,34 +2459,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
diff --git a/po/sl.po b/po/sl.po
index 63335be8..1192ecaa 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -521,16 +521,16 @@ msgstr "Mapa"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "Ne morem odpreti datoteke z oznakami.\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne morem prenesti sporočila %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
@@ -972,10 +972,10 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1052,7 +1052,7 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
@@ -1186,7 +1186,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Mapa"
@@ -1274,8 +1274,8 @@ msgstr "/_Dodaj"
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
@@ -2053,12 +2053,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2226,174 +2226,174 @@ msgstr "Imenik spool"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Naredi _novo mapo..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/I_zbriši mapo..."
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Preveri nova sporočila"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Iskanje sporočil..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ni neprebranih sporočil."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Vpis na novičarsko skupino..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Odstrani skupino novic"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Delam mapo View...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporočila v vseh mapah..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, 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:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2403,24 +2403,37 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Izbriši mapo"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2428,21 +2441,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2451,34 +2464,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
diff --git a/po/sr.po b/po/sr.po
index e65d6098..95f10a66 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -522,16 +522,16 @@ msgstr "Direktorijum"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obeleženu datoteku\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za štampanje nije dobra: `%s'\n"
@@ -972,10 +972,10 @@ msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1053,7 +1053,7 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
@@ -1180,7 +1180,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Direktorijum"
@@ -1268,8 +1268,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
@@ -2048,12 +2048,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2221,174 +2221,174 @@ msgstr "Spool direktorijum"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, 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:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi direktorijum..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Obriši direktorijum"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/Osv_eži stablo direktorijuma"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Osveži rezime"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Traži poruke..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepročitanih poruka."
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prijavi se na _news grupu..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Skloni news _grupu"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Nepročitano"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretražujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretražujem direktorijum %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "/O_sveži stablo direktorijuma"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvežavam stablo direktorijuma..."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, 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:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2398,24 +2398,37 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Obriši direktorijum"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2423,21 +2436,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2446,34 +2459,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
diff --git a/po/sv.po b/po/sv.po
index ecd0d1d0..9fc4a8e1 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -518,16 +518,16 @@ msgstr "Skräppostfilter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "kan inte öppna markeringsfil\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan inte hämta meddelande %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando är felaktigt: \"%s\"\n"
@@ -969,10 +969,10 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1050,7 +1050,7 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -1177,7 +1177,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Mapp"
@@ -1265,8 +1265,8 @@ msgstr "/_Lägg till..."
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
@@ -2007,12 +2007,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2179,170 +2179,170 @@ msgstr "Välj katalog"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/_Ny mapp..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/_Byt namn..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/_Flytta..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Ta bort"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Töm _papperskorgen"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Ta emot nya _meddelanden"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/_Uppdatera mappträd"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Sök meddelanden..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/_Hämta"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prenumerera på _diskussionsgrupp"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/T_a bort diskussionsgrupp"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Skapar mappvy...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Olästa"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Ställer in mappinfo...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Ställer in mappinfo..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Söker igenom mapp %s%c%s..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Söker igenom mapp %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mappträd"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mappträdet kommer att uppdateras. Fortsätt?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mappträd..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mappträdet misslyckades."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Skräp"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2352,24 +2352,37 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Ta bort mapp"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2379,20 +2392,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2401,34 +2414,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
diff --git a/po/tr.po b/po/tr.po
index 54f9ce67..a17a5e10 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2004-12-03 11:44+0200\n"
 "Last-Translator: Arman Aksoy <armish@linux-sevenler.org>\n"
 "Language-Team:  <gnome-turk@gnome.org>\n"
@@ -520,16 +520,16 @@ msgstr "dizin:"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kod çevriminde hata.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "işaret dosyası açılamadı\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d. ileti alınamadı\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazdırma komutu geçersiz: `%s'\n"
@@ -969,10 +969,10 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1050,7 +1050,7 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1182,7 +1182,7 @@ msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Dizin"
@@ -1270,8 +1270,8 @@ msgstr "/_Ekle..."
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/Ö_zellikler..."
 
@@ -2041,12 +2041,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2214,171 +2214,171 @@ msgstr "Dizini seç"
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Yeni _dizin yarat..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/D_izinin adını değiştir"
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/D_izinin adını değiştir"
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Dizini _sil"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Çö_pü boşalt"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Y_eni iletileri al"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/Dizin ağacını _yeniden yarat"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Görünüm/_Görünümü güncelle"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/İ_letilerda ara..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/İ_ndir"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Haber grubuna üye ol..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/H_aber grubunu sil"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Dizin görüntüsü oluşturuluyor...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Okunmamış"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlanıyor...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlanıyor..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taranıyor..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taranıyor..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Dizin ağacını yeniden tara"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin ağacı yeniden oluşturulacak. Devam edilsin mi?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Dizin ağacı yeniden yaratılıyor..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin ağacı yeniden oluşturulamadı."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2388,24 +2388,37 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Dizini sil"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2413,21 +2426,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2436,34 +2449,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
diff --git a/po/uk.po b/po/uk.po
index ba569c35..62248212 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2005-10-22 17:21+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -525,16 +525,16 @@ msgstr "фільтр мотлоху"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Перетворення кодів не вдалось.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "не вдалось відкрити файл позначок\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "не вдалось стягти лист %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Невірна команда друку: `%s'\n"
@@ -974,10 +974,10 @@ msgid "/New _Folder"
 msgstr "/Нова папка"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1054,7 +1054,7 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Видалити папку"
 
@@ -1180,7 +1180,7 @@ msgid "Group"
 msgstr "Група"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Папка"
@@ -1268,8 +1268,8 @@ msgstr "/Додати..."
 msgid "/_Remove"
 msgstr "/Видалити"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/Властивості..."
 
@@ -2009,12 +2009,12 @@ msgstr "Редагувати папку"
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2181,170 +2181,170 @@ msgstr "Обрати папку"
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Створити нову папку..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Перейменувати папку..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/Перенести папку..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/Видалити папку"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Спорожнити кошик"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/Перевірити за новими листами"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/Перебудувати дерево папок"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Вигляд/Оновити список"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/Шукати листи..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Завантажити"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Передплатити конференцію"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/Видалити конференцію"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Створення області перегляду папок...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Нові"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Непрочитані"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Встановлюємо інформацію папки...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Встановлюємо інформацію папки..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Перечитуємо папку %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Перечитуємо папку %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Перебудувати дерево папок"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Дерево папок буде перебудовано. Продовжити?"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Перебудовуємо дерево папок..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "Не вдалось перебудувати дерево папок."
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Перевірити за новими листами у всіх папках..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Мотлох"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2354,24 +2354,37 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Видалити папку"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2381,20 +2394,20 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2403,34 +2416,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
diff --git a/po/vi.po b/po/vi.po
index 9da6a279..9e904059 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: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+0900\n"
 "PO-Revision-Date: 2005-11-30 23:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -517,16 +517,16 @@ msgstr "Lọc thư rác"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Chuyển đổi mã thất bại.\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "không thể mở tập tin đánh dấu\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "không thể lấy thư %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Lệnh in không hợp lệ: `%s'\n"
@@ -952,10 +952,10 @@ msgid "/New _Folder"
 msgstr "/Thư _mục mới"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1032,7 +1032,7 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
@@ -1162,7 +1162,7 @@ msgid "Group"
 msgstr "Nhóm"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "Thư mục"
@@ -1250,8 +1250,8 @@ msgstr "/Thê_m..."
 msgid "/_Remove"
 msgstr "/_Xoá bỏ"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/Th_uộc tính"
 
@@ -1991,12 +1991,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:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2164,170 +2164,170 @@ msgstr "Chọn thư mục"
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "Hộp nhận"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "Đã gửi"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "Đợi gửi"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "Thùng rác"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "Nháp"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "Thư mục mới"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, 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:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Không tạo được thư mục `%s'."
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/Tạo thư mục _mới..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/Đổi _tên thư mục..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/_Di chuyển thư mục..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/_Xoá thư mục"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/Đổ _rác"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/_Kiểm tra thư mới"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/_Làm lại cây thư mục"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Xem/_Cập nhật tóm tắt"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/_Tìm thư..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/Tải _về"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Đăng kí vào _nhóm tin..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/_Xoá nhóm tin"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "Đang tạo khung thư mục...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "Mới"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "Chưa đọc"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "Thiết lập thông tin thư mục...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "Thiết lập thông tin thư mục..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Đang quét thư mục %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Đang quét thư mục %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "Làm lại cây thư mục"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 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:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "Đang làm lại cây thư mục..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 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:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "Kiểm tra thư mới trong mọi thư mục..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "Rác"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Thư mục %s được chọn\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Có lỗi khi tải thư về trong `%s'."
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2337,24 +2337,37 @@ 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:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Đặt tên cho `%s':"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "Xoá thư mục"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2364,21 +2377,21 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục `%s'."
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2387,34 +2400,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:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, 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:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f748f868..3012c67e 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -515,16 +515,16 @@ msgstr "文件夹："
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()：代码转换失败。\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "无法打开标记文件\n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "无法获取邮件 %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "打印命令行无效：“%s”\n"
@@ -963,10 +963,10 @@ msgid "/New _Folder"
 msgstr "/新建文件夹(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1043,7 +1043,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -1168,7 +1168,7 @@ msgid "Group"
 msgstr "群组"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "文件夹"
@@ -1256,8 +1256,8 @@ msgstr "/添加(_A)..."
 msgid "/_Remove"
 msgstr "/删除(_R)"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/属性(_P)..."
 
@@ -2003,12 +2003,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2176,171 +2176,171 @@ msgstr "邮件池目录"
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/创建新文件夹(_N)..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/重命名文件夹(_R)..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/重命名文件夹(_R)..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/删除文件夹(_D)"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/清空废件箱(_T)"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/检查新邮件(_C)"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/重建文件夹树(_E)"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/查看(_V)/更新摘要(_U)"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/查找邮件(_S)..."
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/下载(_L)"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/订阅新闻组(_B)..."
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/删除新闻组(_R)"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "正在创建文件夹视图...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "新建"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未读"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "正在设置文件夹信息...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "正在设置文件夹信息..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "正在扫描文件夹 %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "正在扫描文件夹 %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "重建文件夹树"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "文件夹树将重建。继续吗？"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "正在重建文件夹树..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建文件夹树失败。"
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "正在检查所有文件夹中的新邮件..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2350,24 +2350,37 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
+#, c-format
+msgid ""
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "删除文件夹"
+
+#: src/folderview.c:2305
 #, fuzzy, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2375,21 +2388,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2398,34 +2411,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 62bf6589..8b606157 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: 2005-12-26 17:22+0900\n"
+"POT-Creation-Date: 2006-01-05 16:37+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"
@@ -519,16 +519,16 @@ msgstr "垃圾郵件資料夾"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 轉碼失敗。\n"
 
-#: libsylph/procmsg.c:628
+#: libsylph/procmsg.c:620
 msgid "can't open mark file\n"
 msgstr "無法開啟標示的檔案 \n"
 
-#: libsylph/procmsg.c:1081
+#: libsylph/procmsg.c:1072
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "無法擷取郵件 %d\n"
 
-#: libsylph/procmsg.c:1336
+#: libsylph/procmsg.c:1327
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "列印命令錯誤：「%s」\n"
@@ -966,10 +966,10 @@ msgid "/New _Folder"
 msgstr "/新增資料夾(_F)"
 
 #: src/addressbook.c:383 src/addressbook.c:393 src/compose.c:508
-#: src/folderview.c:244 src/folderview.c:246 src/folderview.c:251
-#: src/folderview.c:262 src/folderview.c:264 src/folderview.c:266
-#: src/folderview.c:271 src/folderview.c:281 src/folderview.c:283
-#: src/folderview.c:287 src/summaryview.c:399 src/summaryview.c:403
+#: src/folderview.c:245 src/folderview.c:247 src/folderview.c:252
+#: src/folderview.c:263 src/folderview.c:265 src/folderview.c:267
+#: src/folderview.c:272 src/folderview.c:282 src/folderview.c:284
+#: src/folderview.c:288 src/summaryview.c:399 src/summaryview.c:403
 #: src/summaryview.c:407 src/summaryview.c:417 src/summaryview.c:419
 #: src/summaryview.c:431 src/summaryview.c:437
 msgid "/---"
@@ -1046,7 +1046,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2298
+#: src/addressbook.c:1674 src/folderview.c:2308
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -1173,7 +1173,7 @@ msgid "Group"
 msgstr "群組"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3152 src/folderview.c:357 src/prefs_account_dialog.c:1687
+#: src/addressbook.c:3152 src/folderview.c:358 src/prefs_account_dialog.c:1687
 #: src/summary_search.c:367
 msgid "Folder"
 msgstr "資料夾"
@@ -1261,8 +1261,8 @@ msgstr "/新增(_A)..."
 msgid "/_Remove"
 msgstr "/刪除(_R)"
 
-#: src/compose.c:509 src/folderview.c:253 src/folderview.c:273
-#: src/folderview.c:289
+#: src/compose.c:509 src/folderview.c:254 src/folderview.c:274
+#: src/folderview.c:290
 msgid "/_Properties..."
 msgstr "/內容(_P)..."
 
@@ -2001,12 +2001,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2059
-#: src/folderview.c:2065
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2060
+#: src/folderview.c:2066
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2066
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2067
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2173,170 +2173,170 @@ msgstr "選擇目錄"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:359 src/folderview.c:1157 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1158 src/prefs_folder_item.c:236
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:363 src/folderview.c:1163 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1164 src/prefs_folder_item.c:237
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:367 src/folderview.c:1169 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1170 src/prefs_folder_item.c:239
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:371 src/folderview.c:1175 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1176 src/prefs_folder_item.c:240
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:375 src/folderview.c:1181 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1182 src/prefs_folder_item.c:238
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:2063 src/folderview.c:2067
+#: src/foldersel.c:542 src/folderview.c:2064 src/folderview.c:2068
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:550 src/folderview.c:2075 src/folderview.c:2136
+#: src/foldersel.c:550 src/folderview.c:2076 src/folderview.c:2137
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:560 src/folderview.c:2085 src/folderview.c:2144
+#: src/foldersel.c:560 src/folderview.c:2086 src/folderview.c:2145
 #: src/summary_search.c:989
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:2092
+#: src/foldersel.c:568 src/folderview.c:2093
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
 
-#: src/folderview.c:240 src/folderview.c:258
+#: src/folderview.c:241 src/folderview.c:259
 msgid "/Create _new folder..."
 msgstr "/產生新的資料夾(_N)..."
 
-#: src/folderview.c:241 src/folderview.c:259
+#: src/folderview.c:242 src/folderview.c:260
 msgid "/_Rename folder..."
 msgstr "/重新命名資料夾(_R)..."
 
-#: src/folderview.c:242 src/folderview.c:260
+#: src/folderview.c:243 src/folderview.c:261
 msgid "/_Move folder..."
 msgstr "/移除資料夾(_M)..."
 
-#: src/folderview.c:243 src/folderview.c:261
+#: src/folderview.c:244 src/folderview.c:262
 msgid "/_Delete folder"
 msgstr "/刪除資料夾(_D)"
 
-#: src/folderview.c:245 src/folderview.c:263
+#: src/folderview.c:246 src/folderview.c:264
 msgid "/Empty _trash"
 msgstr "/清空刪除的郵件(_T)"
 
-#: src/folderview.c:247 src/folderview.c:267 src/folderview.c:284
+#: src/folderview.c:248 src/folderview.c:268 src/folderview.c:285
 msgid "/_Check for new messages"
 msgstr "/檢查新郵件(_C)"
 
-#: src/folderview.c:249 src/folderview.c:269
+#: src/folderview.c:250 src/folderview.c:270
 msgid "/R_ebuild folder tree"
 msgstr "/重建資料夾結構(_E)"
 
-#: src/folderview.c:250 src/folderview.c:270 src/folderview.c:286
+#: src/folderview.c:251 src/folderview.c:271 src/folderview.c:287
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/顯示(_V)/更新郵件列表(_U)"
 
-#: src/folderview.c:252 src/folderview.c:272 src/folderview.c:288
+#: src/folderview.c:253 src/folderview.c:273 src/folderview.c:289
 msgid "/_Search messages..."
 msgstr "/尋找郵件(_S)"
 
-#: src/folderview.c:265 src/folderview.c:282
+#: src/folderview.c:266 src/folderview.c:283
 msgid "/Down_load"
 msgstr "/下載(_L)"
 
-#: src/folderview.c:278
+#: src/folderview.c:279
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/預訂新聞群組(_B)"
 
-#: src/folderview.c:280
+#: src/folderview.c:281
 msgid "/_Remove newsgroup"
 msgstr "/移除新聞群組(_R)"
 
-#: src/folderview.c:310
+#: src/folderview.c:311
 msgid "Creating folder view...\n"
 msgstr "產生資料夾檢視...\n"
 
-#: src/folderview.c:388
+#: src/folderview.c:389
 msgid "New"
 msgstr "新的"
 
 #. S_COL_MARK
-#: src/folderview.c:402 src/prefs_summary_column.c:71
+#: src/folderview.c:403 src/prefs_summary_column.c:71
 msgid "Unread"
 msgstr "未讀的"
 
-#: src/folderview.c:416
+#: src/folderview.c:417
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:547
+#: src/folderview.c:548
 msgid "Setting folder info...\n"
 msgstr "設定資料夾...\n"
 
-#: src/folderview.c:548
+#: src/folderview.c:549
 msgid "Setting folder info..."
 msgstr "設定資料夾..."
 
-#: src/folderview.c:848 src/mainwindow.c:3360 src/setup.c:80
+#: src/folderview.c:849 src/mainwindow.c:3360 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "掃描資料夾 %s%c%s ..."
 
-#: src/folderview.c:852 src/mainwindow.c:3365 src/setup.c:85
+#: src/folderview.c:853 src/mainwindow.c:3365 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "掃描資料夾 %s ..."
 
-#: src/folderview.c:894
+#: src/folderview.c:895
 msgid "Rebuild folder tree"
 msgstr "重建資料夾結構"
 
-#: src/folderview.c:895
+#: src/folderview.c:896
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "準備重建資料夾。確定要繼續？"
 
-#: src/folderview.c:904
+#: src/folderview.c:905
 msgid "Rebuilding folder tree..."
 msgstr "重建資料夾結構中..."
 
-#: src/folderview.c:911
+#: src/folderview.c:912
 msgid "Rebuilding of the folder tree failed."
 msgstr "重建資料夾結構失敗。"
 
-#: src/folderview.c:1024
+#: src/folderview.c:1025
 msgid "Checking for new messages in all folders..."
 msgstr "檢查每個資料夾中的新郵件..."
 
-#: src/folderview.c:1189 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
+#: src/folderview.c:1190 src/mainwindow.c:2352 src/prefs_common_dialog.c:1793
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/folderview.c:1809
+#: src/folderview.c:1810
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:1964
+#: src/folderview.c:1965
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:1999
+#: src/folderview.c:2000
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2060
+#: src/folderview.c:2061
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2346,24 +2346,37 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2124
+#: src/folderview.c:2125
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2125
+#: src/folderview.c:2126
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2230
+#: src/folderview.c:2231
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2295
+#: src/folderview.c:2297
 #, c-format
 msgid ""
-"All folders and messages under `%s' will be permanently deleted.\n"
+"The search folder '%s' will be deleted.\n"
+"The real messages are not deleted.\n"
+"Really delete it?"
+msgstr ""
+
+#: src/folderview.c:2300
+#, fuzzy
+msgid "Delete search folder"
+msgstr "刪除資料夾"
+
+#: src/folderview.c:2305
+#, fuzzy, c-format
+msgid ""
+"All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
@@ -2373,20 +2386,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2325
-#, c-format
-msgid "Can't remove the folder `%s'."
+#: src/folderview.c:2337 src/folderview.c:2343
+#, fuzzy, c-format
+msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2361
+#: src/folderview.c:2379
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2362
+#: src/folderview.c:2380
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2401
+#: src/folderview.c:2419
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2395,34 +2408,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2403
+#: src/folderview.c:2421
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2453
+#: src/folderview.c:2471
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2454
+#: src/folderview.c:2472
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2602
+#: src/folderview.c:2625
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2603
+#: src/folderview.c:2626
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2653
+#: src/folderview.c:2676
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2654
+#: src/folderview.c:2677
 msgid "Delete news account"
 msgstr "刪除帳號"