po/tr.po: fixed a typo which caused crash.

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

30 files changed, 3026 insertions, 3085 deletions

diff --git a/po/ChangeLog b/po/ChangeLog
index 363aa92d..59e1358e 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-27
+
+	* fixed a typo which caused crash in tr.po.
+	* fixed a typo in ja.po.
+
 2006-05-29
 
 	* updated es.po.
diff --git a/po/bg.po b/po/bg.po
index 3a8d60a6..80f6b7b5 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.9.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -294,30 +294,25 @@ msgstr "пощенската кутия не може да се съкрати �
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Изнасяне на съобщения от %s във %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не може да се копира съобщението %s във %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Не може да се отвори файлът с маркировките.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "изходната папка е еднаква с назначението.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr ""
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +321,7 @@ msgstr ""
 "Файлът `%s' вече съществува.\n"
 "Папката не може да се създаде."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1023,7 +1018,7 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
@@ -1233,7 +1228,7 @@ msgstr "Кафяв"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Никой"
 
@@ -1602,7 +1597,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
@@ -1724,7 +1719,7 @@ msgstr "MIME тип"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Размер"
 
@@ -2040,12 +2035,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2233,22 +2228,22 @@ msgstr "Кошче"
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
@@ -2374,22 +2369,22 @@ msgstr "Проверяване за нови съобщения във всич�
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2399,26 +2394,26 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2427,12 +2422,12 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2443,21 +2438,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2466,34 +2461,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2509,7 +2504,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -3607,8 +3602,8 @@ msgstr "Създаване на главен прозорец...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -3917,25 +3912,25 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Изпълняване"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5900,17 +5895,17 @@ msgid "Attachment"
 msgstr "Притурка"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Дата"
 
@@ -6027,7 +6022,7 @@ msgstr "Сканиране на папка %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
@@ -6492,216 +6487,216 @@ msgstr "Има останали маркери. Желаете ли да се о
 msgid "Scanning folder (%s)..."
 msgstr "Сканиране на папка (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Търсене отново"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Няма повече непрочетени съобщения"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Не е намерено непрочетено съобщение. Търсене от края?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Няма непрочетени съобщения."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Не е намерено непрочетено съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Няма повече нови съобщения"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Не е намерено ново съобщение. Търсене от края?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Няма нови съобщения."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Не е намерено ново съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Няма повече маркирани съобщения"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Не е намерено маркирано съобщение. Търсене от края?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Няма маркирани съобщения."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не е намерено маркирано съобщение. Търсене от началото?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Не е намерено съобщение с етикет. Търсене от края?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Няма съобщения с етикет"
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не е намерено съобщение с етикет. Търсене от началото?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Събиране на съобщения по тема..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d изтрити"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d преместени"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копирани"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr "избран(и)"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нови, %d непрочетени, %d общо (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нови, %d непрочетени, %d общо"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "No."
 
diff --git a/po/cs.po b/po/cs.po
index 42f5f5ac..6271d8f2 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -297,30 +297,25 @@ msgstr "nemůžu smazat poštovní schránku.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportuji zprávy z %s do %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Nemohu zkopírovat zprávu %s do %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Nemohu otevřít označený soubor.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojová složka je stejná jako cílová.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopíruji zprávu %s%c%d do %s...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Poslední počet v adresáři %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -329,7 +324,7 @@ msgstr ""
 "Soubor '%s' už existuje.\n"
 "Nemohu vytvořit složku."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1025,7 +1020,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Smazat složku "
 
@@ -1234,7 +1229,7 @@ msgstr "Hnědá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Žádná"
 
@@ -1603,7 +1598,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
@@ -1725,7 +1720,7 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Délka"
 
@@ -2042,12 +2037,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -2235,22 +2230,22 @@ msgstr "Koš"
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, 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:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvořit složku '%s'."
@@ -2377,22 +2372,22 @@ msgstr "Zjišťuji nové zprávy ve všech složkách..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Posílám zprávu"
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, 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:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2402,26 +2397,26 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít další\n"
 "podsložky, přidejte nakonec názvu '/')"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nové jméno pro '%s' :"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2430,12 +2425,12 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Smazat složku "
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2446,21 +2441,21 @@ msgstr ""
 "Všechny složky a zprávy v '%s' budou vymazány.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2469,34 +2464,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 účet '%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 účet"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Smazat účet pro diskuzní skupinu"
 
@@ -2512,7 +2507,7 @@ msgstr "Předmět:"
 msgid "Creating header view...\n"
 msgstr "Vytvářím náhled na záhlaví...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
@@ -3610,8 +3605,8 @@ msgstr "Vytvářím hlavní okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3921,25 +3916,25 @@ msgstr "Přílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Provést"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5903,17 +5898,17 @@ msgid "Attachment"
 msgstr "Příloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Datum"
 
@@ -6029,7 +6024,7 @@ msgstr "Prohledávám složku %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
@@ -6496,217 +6491,217 @@ msgstr "Zbyly nějaké označené. Zpracovat je?"
 msgid "Scanning folder (%s)..."
 msgstr "Prohledávám složku (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Hledat znova"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Nejsou již žádné nepřečtené zprávy"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Nejsou již žádné nové zprávy"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nová zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Nejsou již žádné označené zprávy"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Žádná neoznačená zpráva."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná neoznačená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Nejsou již žádné zprávy s návěštím"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná zpráva s návěštím. Hledat od konce?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Žádná zpráva s návěštím."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenalezena žádná zpráva s návěštím. Hledat od začátku?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Získávám zprávy od osoby..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d smazané"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d přemístěné"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkopírováno"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " položky(ek) vybrány"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nových, %d nepřečtených, %d celkem"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisuji celkovou mezipaměť (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Zpráva %d je označena jako přečtená\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Zpráva %d je označena jako nepřečtená\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Zpráva %s/%d je nastavena ke smazání\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Smazat zprávu(y)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Opravdu chcete smazat tuto zprávu(y) z koše?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d je odznačena\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Zpráva %d je nastavena pro přesun do %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Zpráva %d je nastavena pro kopírování do %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Čís."
 
@@ -6796,6 +6791,9 @@ msgstr "Ukončení programu"
 msgid "Sylpheed"
 msgstr "Starý Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Poslední počet v adresáři %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Neplatná příkazová řádka prohlížeče MIME: '%s'"
 
diff --git a/po/da.po b/po/da.po
index 2a31acdc..b9616b8d 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed    \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -296,30 +296,25 @@ msgstr "kan ikke tømme mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksporterer meddelelse fra %s til %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan ikke kopiere meddelelse %s til %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Kan ikke åbne markéret fil.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "fra og til mappe er ens.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Sidste nummer i sti %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -328,7 +323,7 @@ msgstr ""
 "Filen `%s' eksisterer allerede.\n"
 "Kan ikke oprette mappe."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1026,7 +1021,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -1231,7 +1226,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Ingen"
 
@@ -1600,7 +1595,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
@@ -1722,7 +1717,7 @@ msgstr "MIME type"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Størrelse"
 
@@ -2038,12 +2033,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2231,22 +2226,22 @@ msgstr "Slettet"
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
@@ -2373,22 +2368,22 @@ msgstr "Henter nye meddelelser i alle mapper..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2398,26 +2393,26 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2426,12 +2421,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2442,21 +2437,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2465,34 +2460,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2508,7 +2503,7 @@ msgstr "Emne:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -3610,8 +3605,8 @@ msgstr "Opretter hoved vindue...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -3920,25 +3915,25 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Udfør"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5898,17 +5893,17 @@ msgid "Attachment"
 msgstr "Vedhæftet"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Dato"
 
@@ -6024,7 +6019,7 @@ msgstr "Gennemsøger mappe %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
@@ -6494,219 +6489,219 @@ msgstr "Nogle markéringer er tilbage. Bearbejde dem?"
 msgid "Scanning folder (%s)..."
 msgstr "Søger mappe (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Søg igen"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ulæste meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Ingen ulæste meddelelser."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Ingen ulæste meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Ingen nye meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen markérede meddelelser fundet. Søg bagfra?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Ingen markérede eddelelser."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen markérede meddelelser funder. Søg bagfra?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Ingen markérede meddelelser."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ulæst, %d total (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ulæste, %d total"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Nr."
 
@@ -6796,6 +6791,9 @@ msgstr "Afslut"
 msgid "Sylpheed"
 msgstr "Gl. Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Sidste nummer i sti %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "MIME visnings kommando ugyldig: `%s'"
 
diff --git a/po/de.po b/po/de.po
index aae60e6b..6181d4d3 100644
--- a/po/de.po
+++ b/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-02-06 13:01+0100\n"
 "Last-Translator: Fridtjof Busse <fridtjof@fbunet.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -294,30 +294,25 @@ msgstr "Kann Mailbox nicht auf null setzen.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportiere Nachrichten von %s in %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kann Nachricht %s nicht nach %s kopieren\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Kann markierte Datei nicht öffnen.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "Die Quellablage ist identisch mit dem Ziel.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiere Nachricht %s%c%d nach %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Letzte Nummer im Verzeichnis %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -326,7 +321,7 @@ msgstr ""
 "Datei '%s' existiert bereits.\n"
 "Kann Ablage nicht erstellen."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1028,7 +1023,7 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
@@ -1237,7 +1232,7 @@ msgstr "Braun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Keine"
 
@@ -1569,7 +1564,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -1691,7 +1686,7 @@ msgstr "MIME-Typ"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Größe"
 
@@ -2000,12 +1995,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2192,22 +2187,22 @@ msgstr "Papierkorb"
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
@@ -2329,22 +2324,22 @@ msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2354,26 +2349,26 @@ msgstr ""
 "(wenn Sie eine Ablage zum Speichern von Unterablagen erstellen wollen,\n"
 "dann hängen Sie ein `/' an das Ende des Namens)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kann Ablage '%s' nicht umbenennen."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2382,11 +2377,11 @@ msgstr ""
 "Suchablage '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Suchablage löschen"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2399,20 +2394,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2421,34 +2416,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -2464,7 +2459,7 @@ msgstr "Betreff:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -3533,8 +3528,8 @@ msgstr "Erstelle Hauptfenster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -3858,24 +3853,24 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Diese Nachricht wird mit dem folgenden Befehl gedruckt:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Standarddruckbefehl)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5771,17 +5766,17 @@ msgid "Attachment"
 msgstr "Anhang"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Datum"
 
@@ -5898,7 +5893,7 @@ msgstr "Suche %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Suche %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
@@ -6366,214 +6361,214 @@ msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "Weiter_suchen"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " Einträge gewählt"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Nr."
 
@@ -6655,6 +6650,9 @@ msgstr "Be_enden"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Letzte Nummer im Verzeichnis %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "MIME Betrachterbefehl ist ungültig: '%s'"
 
diff --git a/po/el.po b/po/el.po
index ba26ff93..2686c50c 100644
--- a/po/el.po
+++ b/po/el.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -298,30 +298,25 @@ msgstr "δεν μπορώ να μηδενίσω το mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Εξαγωγή μηνυμάτων από %s προς %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το μήνυμα %s στο %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Δεν μπορώ να ανοίξω σημειωμένο αρχείο.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "ο πηγαίος κατάλογος είναι ίδιος με τον κατάλογο προορισμού.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Τελευταίος αριθμός στον κατάλογο %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -330,7 +325,7 @@ msgstr ""
 "Το αρχείο `%s' υπάρχει ήδη.\n"
 "Δεν μπορώ να δημιουργήσω τον κατάλογο."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1036,7 +1031,7 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
@@ -1241,7 +1236,7 @@ msgstr "Καφέ"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Τέλος"
 
@@ -1623,7 +1618,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Χωρίς Θέμα)"
 
@@ -1743,7 +1738,7 @@ msgstr "τύπος MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -2069,12 +2064,12 @@ msgstr "Επεξεργασία καταλόγου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -2269,22 +2264,22 @@ msgstr "Διαγραμμένα"
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%s'."
@@ -2418,22 +2413,22 @@ msgstr "Σύνθεση νέου μηνύματος"
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ο κατάλογος %s είναι επιλεγμένος\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2443,26 +2438,26 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα κατάλογο για να βάλετε υποκαταλόγους\n"
 " προσθέστε το `/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Δώστε νέο όνομα για `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Μετονομασία καταλόγου"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2471,12 +2466,12 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2487,21 +2482,21 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2510,35 +2505,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
@@ -2554,7 +2549,7 @@ msgstr "Θέμα:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργώ την απεικόνιση κεφαλίδας...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -3734,8 +3729,8 @@ msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -4056,25 +4051,25 @@ msgstr "Προσάρτηση"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Εκτέλεση"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -6043,17 +6038,17 @@ msgid "Attachment"
 msgstr "Προσάρτηση"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6178,7 +6173,7 @@ msgstr "Σάρωση καταλόγου %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
@@ -6663,223 +6658,223 @@ msgstr "Μερικές σημάνσεις έχουν απομείνει. Να ε
 msgid "Scanning folder (%s)..."
 msgstr "Σάρωση καταλόγου (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Η αναζήτηση απέτυχε"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 #, fuzzy
 msgid "No more new messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 #, fuzzy
 msgid "No new messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Δεν υπάρχουν άλλα μηνύματα με ετικέτες"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Δεν υπάρχουν μηνύματα με ετικέτες."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d διαγράφηκαν"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d μετακινήθηκαν"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d αντιγράφηκαν"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " μήνυμα(τα) επιλέχθηκε(αν)"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr ""
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d σημειώθηκε\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως διαβασμένο\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως αδιάβαστο\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d έχει οριστεί για διαγραφή\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα %s/%d δεν έχει σημειωθεί\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί για μετακίνηση στο %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί να αντιγραφεί στο %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Αρ."
 
@@ -6967,6 +6962,9 @@ msgstr "Έξοδος"
 msgid "Sylpheed"
 msgstr ""
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Τελευταίος αριθμός στον κατάλογο %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Η γραμμή εντολής για απεικόνιση MIME είναι μη έγκυρη: `%s'"
 
diff --git a/po/es.po b/po/es.po
index b29ddfb7..cd65b5d6 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-02-02 07:38+0100\n"
 "Last-Translator: Ricardo Mones <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones <mones@aic.uniovi.es>\n"
@@ -292,30 +292,25 @@ msgstr "no se puede truncar a cero el buzón.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensajes de %s a %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "no se puede copiar mensaje %s a %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "No se puede abrir el fichero de marcas.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de origen y destino idénticas.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Último número en directorio %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +319,7 @@ msgstr ""
 "El fichero «%s» ya existe.\n"
 "No puedo crear la carpeta."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1024,7 +1019,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1233,7 +1228,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Ninguno"
 
@@ -1565,7 +1560,7 @@ msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1689,7 +1684,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Tamaño"
 
@@ -1998,12 +1993,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2191,22 +2186,22 @@ msgstr "Papelera"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, 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:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -2328,22 +2323,22 @@ msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 msgid "Junk"
 msgstr "Basura"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2353,26 +2348,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede renombrar la carpeta «%s»."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2381,11 +2376,11 @@ msgstr ""
 "¿Eliminar la carpeta de búsqueda «%s» ?\n"
 "(Los mensajes no se borrarán)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Borrar carpeta de búsqueda"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2398,20 +2393,20 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede borrar la carpeta «%s»."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2420,34 +2415,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2463,7 +2458,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -3529,8 +3524,8 @@ msgstr "Creando ventana principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3855,24 +3850,24 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr "Vista de mensaje - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "El mensaje se imprimirá con la orden siguiente:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Orden para imprimir por omisión)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5757,17 +5752,17 @@ msgid "Attachment"
 msgstr "Adjunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Fecha"
 
@@ -5882,7 +5877,7 @@ msgstr "Buscando %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Buscando %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6339,214 +6334,214 @@ msgstr "Queda alguna marca. ¿Procesarla?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "_Buscar de nuevo"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "No."
 
@@ -6626,3 +6621,6 @@ msgstr "_Salir"
 #: src/trayicon.c:139
 msgid "Sylpheed"
 msgstr "Sylpheed"
+
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Último número en directorio %s = %d\n"
diff --git a/po/et.po b/po/et.po
index 87ad9de5..14626071 100644
--- a/po/et.po
+++ b/po/et.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -299,30 +299,25 @@ msgstr "kirjakasti ei saa lõigata nulliks.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Ekspordime teated %s-ist %s-i ...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ei saa kirja kopeerida %s-st %s-i\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Ei suutnud avada märgi faili.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "lähtekaust on identne sihtkaustale.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Viimane number kataloogis %s on %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -331,7 +326,7 @@ msgstr ""
 "Fail %s on juba olemas.\n"
 "Ei saa kausta luua."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1028,7 +1023,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -1238,7 +1233,7 @@ msgstr "Pruun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1608,7 +1603,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
@@ -1730,7 +1725,7 @@ msgstr "MIME tüüp"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Suurus"
 
@@ -2047,12 +2042,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2240,22 +2235,22 @@ msgstr "Prügikast"
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
@@ -2385,22 +2380,22 @@ msgstr "Kõigis kaustades otsitakse uusi kirju..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2410,26 +2405,26 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2438,12 +2433,12 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2454,21 +2449,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2477,34 +2472,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2520,7 +2515,7 @@ msgstr "Pealkiri:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -3615,8 +3610,8 @@ msgstr "Loon peamise akna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -3924,25 +3919,25 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Käivita"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5904,17 +5899,17 @@ msgid "Attachment"
 msgstr "Manus"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6030,7 +6025,7 @@ msgstr "Tuhnin kaustas %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
@@ -6497,217 +6492,217 @@ msgstr "Mõned märgid on jäänud. Protsessime selle?"
 msgid "Scanning folder (%s)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates lõpust?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates lõpust?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Uusi kirju ei leidu. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Pole Rohkem märgitud kirju"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Märgitud kirju ei ole."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "*Võtan kirju päälkirja järgi..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on ülekantud"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " kirja märgitud"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Ei."
 
@@ -6797,6 +6792,9 @@ msgstr "Välju"
 msgid "Sylpheed"
 msgstr "Vana Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Viimane number kataloogis %s on %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "MIME vaataja käsurida pole õige: %s"
 
diff --git a/po/fr.po b/po/fr.po
index 5fc2dd5d..c2c44e02 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -14,7 +14,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-02-23 00:32+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -300,30 +300,25 @@ msgstr "Impossible de vider la boîte aux lettres.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportation des messages de %s vers %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "Impossible de copier le message de %s à %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Impossible d'ouvrir le fichier des marques.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "dossier source identique à la destination.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Dernier numéro dans le répertoire %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -332,7 +327,7 @@ msgstr ""
 "Le fichier « %s » existe déjà.\n"
 "Impossible de créer le dossier."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1038,7 +1033,7 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1248,7 +1243,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Aucun"
 
@@ -1582,7 +1577,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -1704,7 +1699,7 @@ msgstr "Type MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Taille"
 
@@ -2016,12 +2011,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2209,22 +2204,22 @@ msgstr "Corbeille"
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, 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:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
@@ -2346,23 +2341,23 @@ msgstr "Recherche des nouveaux messages..."
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, 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:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2372,26 +2367,26 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de renommer le dossier « %s »."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2400,11 +2395,11 @@ msgstr ""
 "Effacer le dossier de tri « %s » ?\n"
 "Les messages existants ne seront PAS effacés du disque."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Effacer le dossier de tri"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2417,20 +2412,20 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible d'effacer le dossier « %s »."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Effacer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2439,34 +2434,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:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2482,7 +2477,7 @@ msgstr "Sujet :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -3561,8 +3556,8 @@ msgstr "Création de la fenêtre principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3888,24 +3883,24 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr "Fenêtre des messages - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Le message sera imprimer à l'aide de la commande suivante :"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Commande d'impression par défaut)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5798,17 +5793,17 @@ msgid "Attachment"
 msgstr "Pièces jointes"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Date"
 
@@ -5924,7 +5919,7 @@ msgstr "Recherche %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Recherche %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6383,216 +6378,216 @@ msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "_Chercher encore"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Pas de message non lu. Passer au dossier suivant ?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Plus de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrage (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "N°"
 
@@ -6673,6 +6668,9 @@ msgstr "_Quitter"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Dernier numéro dans le répertoire %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "La ligne de commande du visualiseur MIME est invalide: « %s »"
 
diff --git a/po/gl.po b/po/gl.po
index 42b3338d..5b0561e0 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -298,30 +298,25 @@ msgstr "non se pode truncar a cero a caixa de correo.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensaxes de %s a %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "non se pode copiar mensaxe %s a %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Non se pode abrir o ficheiro de marcas.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "carpetas de orixen e destiño idénticas.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Último número en directorio %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -330,7 +325,7 @@ msgstr ""
 "o Ficheiro `%s' xa existe.\n"
 "Non podo crear a carpeta."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1026,7 +1021,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1237,7 +1232,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Ningún"
 
@@ -1607,7 +1602,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1729,7 +1724,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Tamaño"
 
@@ -2045,12 +2040,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2239,22 +2234,22 @@ msgstr "Papeleira"
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
@@ -2381,22 +2376,22 @@ msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2406,26 +2401,26 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2434,12 +2429,12 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2450,21 +2445,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2473,34 +2468,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2516,7 +2511,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -3614,8 +3609,8 @@ msgstr "Creando Fiestra principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -3925,25 +3920,25 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Executar"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5902,17 +5897,17 @@ msgid "Attachment"
 msgstr "Adxunto"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Data"
 
@@ -6028,7 +6023,7 @@ msgstr "Revisando carpeta %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Sin data)"
 
@@ -6494,217 +6489,217 @@ msgstr "Queda algunha marca. ¿Procesa-la?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Búscar de novo"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Non hai mensaxes sen ler. ¿Ir á carpeta seguinte?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Non hai máis mensaxes novas. ¿Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non leídos, %d totales (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non leídos, %d totales"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Non."
 
@@ -6794,6 +6789,9 @@ msgstr "Sair"
 msgid "Sylpheed"
 msgstr "Antigos de Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Último número en directorio %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "o comando do visor MIME non é válido: `%s'"
 
diff --git a/po/hr.po b/po/hr.po
index 9d4bad77..52e99ce4 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -300,30 +300,25 @@ msgstr "ne mogu skratiti sandučić na nulu.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni spis jednak je destinaciji.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Posljednji broj u direktoriju %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -332,7 +327,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu stvoriti spis."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1031,7 +1026,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Obriši spis"
 
@@ -1235,7 +1230,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Ništa"
 
@@ -1617,7 +1612,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1737,7 +1732,7 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Veličina"
 
@@ -2056,12 +2051,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2251,22 +2246,22 @@ msgstr "Smeće"
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, 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:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
@@ -2398,22 +2393,22 @@ msgstr "Kreiranje nove pošte"
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, 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:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2423,26 +2418,26 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2451,12 +2446,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2467,21 +2462,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2490,35 +2485,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2534,7 +2529,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -3712,8 +3707,8 @@ msgstr "Kreiram glavne prozore...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -4027,25 +4022,25 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -6000,17 +5995,17 @@ msgid "Attachment"
 msgstr "Prilog"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Datum"
 
@@ -6127,7 +6122,7 @@ msgstr "Pretražujem spis %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6606,221 +6601,221 @@ msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 msgid "Scanning folder (%s)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Nema više label poruka"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Prihvaćam poruke po temi..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premješteno"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Ne."
 
@@ -6908,6 +6903,9 @@ msgstr "Izlaz"
 msgid "Sylpheed"
 msgstr ""
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Posljednji broj u direktoriju %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Naredba MIME preglednika nije ispravna: `%s'"
 
diff --git a/po/hu.po b/po/hu.po
index d5a67f7b..3caad315 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.0.0beta7\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-02-03 18:15+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -293,30 +293,25 @@ msgstr "nem lehet nulla méretűre változtatni a postafiókot.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Üzenetek exportálása innen: %s ide: %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "%s üzenet nem másolható ide: %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "A jelölő fájlt nem lehet megnyitni.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "A forrás- és célmappa azonos.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "%s%c%d üzenet másolása ide: %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Az utolsó szám a(z) %s mappában = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +320,7 @@ msgstr ""
 "`%s' fájl már létezik.\n"
 "Mappa nem hozható létre."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1029,7 +1024,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -1234,7 +1229,7 @@ msgstr "Barna"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Semmi"
 
@@ -1566,7 +1561,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Egy több részes üzenet egy darabja nem hozzáférhető."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
@@ -1689,7 +1684,7 @@ msgstr "MIME típus"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Méret"
 
@@ -1998,12 +1993,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2190,22 +2185,22 @@ msgstr "Kuka"
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
@@ -2327,22 +2322,22 @@ msgstr "Új üzenetek keresése minden mappában..."
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Üzenetek letöltése %s mappába ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, 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:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2352,26 +2347,26 @@ msgstr ""
 "(Ha egy almappákat tartalmazó mappát szeretne létrehozni,\n"
 "akkor tegyen egy `/' jelet a név végére)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' mappa nem nevezhető át."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2380,11 +2375,11 @@ msgstr ""
 "A(z) `%s' keresési mappa törlése?\n"
 "Az eredeti üzenetek nem törlődnek."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Keresési mappa törlése"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2397,20 +2392,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' mappa nem távolítható el."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2419,34 +2414,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:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -2462,7 +2457,7 @@ msgstr "Tárgy:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -3531,8 +3526,8 @@ msgstr "Főablak létrehozása...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -3835,24 +3830,24 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Üzenetnézet - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Az üzenet a következő paranccsal lesz kinyomtatva:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Alapértelmezett nyomtatási parancs)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5742,17 +5737,17 @@ msgid "Attachment"
 msgstr "Csatolás"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Dátum"
 
@@ -5867,7 +5862,7 @@ msgstr "%s keresése..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s keresése (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
@@ -6324,214 +6319,214 @@ msgstr "Maradt még néhány kijelölt. Feldolgoás?"
 msgid "Scanning folder (%s)..."
 msgstr "(%s) mappa átvizsgálása..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "Keresés ú_jra"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Nincs további olvasatlan üzenet"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Nem található olvasatlan üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Nincs olvasatlan üzenet.."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Nem található olvasatlan üzenet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Nincs több új üzenet"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Nem található új üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Nincs új üzenet."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Nem található új üzenet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Nincs további kijelölt üzenet"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Nem található kijelölt üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Nincs kijelölt üzenet."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem található kijelölt üzenet. Keresés az elejéről?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Nincs további címkézett üzenet."
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem található címkézett üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Nincs címkézett üzenet."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem található címkézett üzenet. Keresés az elejéről?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Üzenetek tárgy szerint..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " elem kiválasztva"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d új, %d olvasatlan, %d összesen"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d üzenet kijelölve.\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d üzenet olvasottnak jelölve.\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d üzenet olvasatlannak jelölve.\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d üzenet törlésre kijelölve\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az üzenete(ke)t a kukából?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező üzenetek törlése..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d üzenet kijelölésének megszüntetése.\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d üzenet kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d üzenet kijelölve %s mappába másolásra\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Hiba az üzenetek feldolgozása közben."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Üzenetfolyam felépítése"
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d üzenet szűrése elvégezve."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Db"
 
@@ -6612,6 +6607,9 @@ msgstr "_Kilépés"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Az utolsó szám a(z) %s mappában = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "MIME megjelenítő parancssor érvénytelen: `%s'"
 
diff --git a/po/it.po b/po/it.po
index a5fa7eea..8f9bc008 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-03-31 18:46+0200\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -293,30 +293,25 @@ msgstr "impossibile troncare a zero la casella postale.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Esportazione dei messaggi da %s in %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "impossibile copiare il messaggio %s in %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "impossibile aprire il file delle segnature.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "la cartella sorgente é identica a quella di destinazione.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copia del messaggio %s%c%d in %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Ultimo numero nella cartella %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +320,7 @@ msgstr ""
 "Il file «%s» esiste già.\n"
 "Impossibile creare la cartella."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1028,7 +1023,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -1237,7 +1232,7 @@ msgstr "Marrone"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Niente"
 
@@ -1569,7 +1564,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
@@ -1695,7 +1690,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Dimensione"
 
@@ -2005,12 +2000,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2198,22 +2193,22 @@ msgstr "Cestino"
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
@@ -2335,22 +2330,22 @@ msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2360,26 +2355,26 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossibile rinominare la cartella «%s»."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2388,11 +2383,11 @@ msgstr ""
 "Rimuovere la cartella di ricerca «%s» ?\n"
 "I messaggi reali non saranno eliminati."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Elimina la cartella di ricerca"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2406,20 +2401,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2428,34 +2423,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -2471,7 +2466,7 @@ msgstr "Oggetto:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -3538,8 +3533,8 @@ msgstr "Creazione della finestra principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -3864,24 +3859,24 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Il messaggio sarà stampato con il seguente comando:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Comando di stampa predefinito)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5776,17 +5771,17 @@ msgid "Attachment"
 msgstr "Allegato"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Data"
 
@@ -5902,7 +5897,7 @@ msgstr "Ricerca in %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Ricerca in %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
@@ -6359,216 +6354,216 @@ msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
 msgid "Scanning folder (%s)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "_Ricerca ancora"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Non esistono più messaggi non letti"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Non esistono più messaggi nuovi"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Non esistono più messaggi segnati"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Non esistono più messaggi etichettati"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "No."
 
@@ -6649,3 +6644,6 @@ msgstr "_Esci"
 #: src/trayicon.c:139
 msgid "Sylpheed"
 msgstr "Sylpheed"
+
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Ultimo numero nella cartella %s = %d\n"
diff --git a/po/ja.po b/po/ja.po
index a5cd3fdd..ec409228 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -292,30 +292,25 @@ msgstr "メールボックスをゼロに切り詰められません。\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "メッセージを %s から %s に書き出しています...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "メッセージ %s を %s にコピーできません\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "マークファイルを開けません。\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "移動元フォルダが移動先と同一です。\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "メッセージ %s%c%d を %s にコピーしています...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "ディレクトリ %s 内の最後の番号 = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +319,7 @@ msgstr ""
 "ファイル `%s' がすでに存在します。\n"
 "フォルダを作成できません。"
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1024,7 +1019,7 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
@@ -1231,7 +1226,7 @@ msgstr "茶"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "なし"
 
@@ -1563,7 +1558,7 @@ msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
@@ -1685,7 +1680,7 @@ msgstr "MIME タイプ"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "サイズ"
 
@@ -1994,12 +1989,12 @@ msgstr "フォルダの編集"
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -2186,22 +2181,22 @@ msgstr "ごみ箱"
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
@@ -2322,22 +2317,22 @@ msgstr "全フォルダの新着メッセージをチェック中..."
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2347,26 +2342,26 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "フォルダ '%s' の名前を変更できません。"
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "フォルダ `%s' を移動できません。"
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2375,11 +2370,11 @@ msgstr ""
 "検索フォルダ '%s' を削除しますか?\n"
 "実際のメッセージは削除されません。"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "検索フォルダの削除"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2392,20 +2387,20 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "フォルダ '%s' を削除できません。"
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2414,34 +2409,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -2457,7 +2452,7 @@ msgstr "件名:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(差出人不明)"
 
@@ -2975,7 +2970,7 @@ msgstr ""
 
 #: src/mainwindow.c:505
 msgid "/_File/_Mailbox/R_ebuild folder tree"
-msgstr "//ファイル(_F)/メールボックス(_M)/フォルダツリーを再構築(_E)"
+msgstr "/ファイル(_F)/メールボックス(_M)/フォルダツリーを再構築(_E)"
 
 #: src/mainwindow.c:508
 msgid "/_File/_Import mbox file..."
@@ -3523,8 +3518,8 @@ msgstr "メインウィンドウを作成中...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "完了。\n"
 
@@ -3847,24 +3842,24 @@ msgstr "添付"
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "メッセージを以下のコマンドで印刷します:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(既定の印刷コマンド)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5747,17 +5742,17 @@ msgid "Attachment"
 msgstr "添付"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "日付"
 
@@ -5872,7 +5867,7 @@ msgstr "%s を検索中..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s を検索中 (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(日付なし)"
 
@@ -6329,214 +6324,214 @@ msgstr "マークが残っています。処理しますか?"
 msgid "Scanning folder (%s)..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "再検索(_S)"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "未読メッセージなし"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "未読メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "未読メッセージがありません。"
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "未読メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "新着メッセージなし"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "新着メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "新着メッセージがありません。"
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "新着メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "マーク付きメッセージなし"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "マーク付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "マーク付きメッセージがありません。"
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "マーク付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "ラベル付きメッセージなし"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "ラベル付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "ラベル付きメッセージがありません。"
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "ラベル付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "メッセージを件名でまとめています..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d 通削除"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 通移動"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 通コピー"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " 通選択"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通 (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "サマリをソート中..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tメッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "番号"
 
diff --git a/po/ko.po b/po/ko.po
index b9cd22fd..a589f7d0 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed  0.8.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -299,30 +299,25 @@ msgstr "메일박스의 크기를 0으로 만들수가 없습니다.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "메시지를 %s에서 %s로 보냅니다...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "메시지 %s을 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "표시 파일을 열 수가 없습니다.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "옮길 폴더와 옮겨질 폴더가 같습니다.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "디렉토리 %s에서 마지막 숫자 = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -331,7 +326,7 @@ msgstr ""
 "파일 `%s'가 이미 존재합니다.\n"
 "폴더를 생성할 수가 없습니다."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1017,7 +1012,7 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
@@ -1221,7 +1216,7 @@ msgstr "갈색"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "없음"
 
@@ -1591,7 +1586,7 @@ msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -1712,7 +1707,7 @@ msgstr "마임 타입"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "크기"
 
@@ -2029,12 +2024,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2222,22 +2217,22 @@ msgstr "지운 편지함"
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
@@ -2364,22 +2359,22 @@ msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2389,26 +2384,26 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2417,12 +2412,12 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2433,21 +2428,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2456,34 +2451,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2499,7 +2494,7 @@ msgstr "제목:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(???)"
 
@@ -3588,8 +3583,8 @@ msgstr "새 창을 만듭니다...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -3898,25 +3893,25 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "실행"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5852,17 +5847,17 @@ msgid "Attachment"
 msgstr "첨부"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "날짜"
 
@@ -5976,7 +5971,7 @@ msgstr "%s 폴더를 스캔합니다..."
 msgid "Searching %s (%d / %d)..."
 msgstr "필터링..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
@@ -6439,217 +6434,217 @@ msgstr "표시가 여전히 남아있습니다. 그것들을 처리할까요?"
 msgid "Scanning folder (%s)..."
 msgstr "폴더(%s)를 스캔..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "다시 찾기"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "안 읽은 메시지가 없슴 "
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "안 읽은 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "안 읽은 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "새 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "새 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "표시된 메시지가 없습니다"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "표시된 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "표시된 메시지가 없습니다."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "표시된 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "꼬리표있는 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "꼬리표있는 메시지가 없습니다."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "꼬리표있는 메시지가 없습니다. 처음부터 찾을까요?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d개 삭제됨"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d개 이동"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " 아이템 선택"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지(%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "번호"
 
@@ -6739,6 +6734,9 @@ msgstr "끝내기"
 msgid "Sylpheed"
 msgstr "예전 Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "디렉토리 %s에서 마지막 숫자 = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "마임 뷰어의 명령행이 부적절합니다: `%s'"
 
diff --git a/po/lt.po b/po/lt.po
index 9fcc59dc..86ff032d 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -292,30 +292,25 @@ msgstr "negaliu sumažinti dėžutės iki nulio.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportuojami laiškai iš %s į %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "negaliu nukopijuoti laiško %s į %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Negaliu atidaryti žymų bylos.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "pradinis katalogas identiškas paskirties katalogui.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopijuoju laišką %s%c%d į %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Paskutinis numeris kataloge %s - %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +319,7 @@ msgstr ""
 "Byla „%s“ jau egzistuoja.\n"
 "Negaliu sukurti katalogo."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1024,7 +1019,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
@@ -1228,7 +1223,7 @@ msgstr "Ruda"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Nieko"
 
@@ -1560,7 +1555,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės laiško dalies"
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
@@ -1682,7 +1677,7 @@ msgstr "MIME tipas"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Dydis"
 
@@ -1991,12 +1986,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2183,22 +2178,22 @@ msgstr "Šiukšlinė"
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NaujasKatalodas"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
@@ -2320,22 +2315,22 @@ msgstr "Tikrinami nauji laiškai visuose kataloguose..."
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Gaunami laiškai („%s“)..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida gaunant laiškus („%s“)."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2345,26 +2340,26 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Negaliu pervadinti katalogo „%s“"
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2373,11 +2368,11 @@ msgstr ""
 "Ištrinti paieškos katalogą „%s“ ?\n"
 "Tikri laiškai nebus trinami."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Ištrinti paieškos katalogą"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2390,20 +2385,20 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visus laiškus šiukšlinėje?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2412,34 +2407,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(laiškai NEBUS ištrinti iš disko)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -2455,7 +2450,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -3521,8 +3516,8 @@ msgstr "Kuriamas pagrindinis langas..\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -3846,24 +3841,24 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr "Laiško peržiūra - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti bylos „%s“."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Laiškas bus atspausdintas naudojant komandą:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Numatytoji spausdinimo komanda)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Spausdinti"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5744,17 +5739,17 @@ msgid "Attachment"
 msgstr "Priedas"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Data"
 
@@ -5869,7 +5864,7 @@ msgstr "Ieškoma „%s“..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Ieškoma %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Be datos)"
 
@@ -6326,214 +6321,214 @@ msgstr "Palikta žymių. Vykdyti jas?"
 msgid "Scanning folder (%s)..."
 msgstr "Skanuojamas katalogas (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "_Ieškoti dar kartą"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Daugiau nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Nėra neskaitytų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Nėra neskaitytų laiškų."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Nėra neskaitytų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Daugiau nėra naujų laiškų."
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Nėra naujų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Nėra naujų laiškų."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Nėra naujų laiškų. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Daugiau nėra pažymėtų laiškų"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Nėra pažymėtų laiškų."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nėra pažymėtų laiškų. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Daugiau nėra laiškų su etiketėmis"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Nėra laiškų su etiketėmis."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nėra laiškų su etiketėmis. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Laiškai pritraukiami pagal temą..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d ištrinta"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d perkelta"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d nukopijuota"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " objektas(-ai) pažymėti"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nauji: %d, neskaityti: %d, viso: %d (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nauji: %d, neskaityti: %d, viso: %d"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tNustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš laiško duomenų..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Laiškas %d pažymėtas\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Laiškas %d pažymėtas kaip skaitytas\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Laiškas %d pažymėtas kaip neskaitytas\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Laiškas %s/%d pažymėtas trinimui\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Ištrinti laišką(-us)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti laiškus iš šiukšlinės?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Trinami identiški laiškai..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Laiškas %s/%d atžymėtas\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Laiškas %d pažymėtas perkėlimui į %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Laiškas %d pažymėtas kopijavimui į %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su laiškais."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota laiškų: %d"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Nr."
 
@@ -6615,6 +6610,9 @@ msgstr "Iš_eiti"
 msgid "Sylpheed"
 msgstr "„Sylpheed“"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Paskutinis numeris kataloge %s - %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Bloga MIME žiūryklės komanda: „%s“"
 
diff --git a/po/nl.po b/po/nl.po
index ac892e75..a61bd8cf 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 0.8\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-04-30 01:11+0100\n"
 "Last-Translator: Vincent van Adrighem <adrighem@gnome.org>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -295,30 +295,25 @@ msgstr "kan de mailbox niet inkorten tot 0.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Berichten worden geëxporteerd van %s naar %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan bericht niet kopiëren van %s naar %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "de bronmap is hetzelfde als de doelmap.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Laatste nummer in map %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +322,7 @@ msgstr ""
 "Bestand '%s' bestaat al.\n"
 "Kan geen map aanmaken."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1032,7 +1027,7 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -1239,7 +1234,7 @@ msgstr "Bruin"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Geen"
 
@@ -1571,7 +1566,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -1693,7 +1688,7 @@ msgstr "MIME-type"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Grootte"
 
@@ -2003,12 +1998,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2196,22 +2191,22 @@ msgstr "Prullenbak"
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -2333,22 +2328,22 @@ msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 msgid "Junk"
 msgstr "Troep"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het downloaden van berichten in '%s'."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2358,26 +2353,26 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan map '%s' niet hernoemen."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2386,11 +2381,11 @@ msgstr ""
 "Wilt u de zoekmap '%s' verwijderen?\n"
 "De berichten zelf zullen NIET worden verwijderd."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Zoekmap verwijderen"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2403,20 +2398,20 @@ msgstr ""
 "\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2425,34 +2420,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2468,7 +2463,7 @@ msgstr "Onderwerp:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -3539,8 +3534,8 @@ msgstr "Hoofdvenster wordt aangemaakt...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -3869,24 +3864,24 @@ msgstr "Bijlagen"
 msgid "Message View - Sylpheed"
 msgstr "Nieuw bericht - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Het bericht zal afgedrukt worden met de volgende opdracht:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Standaard afdrukopdracht)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5779,17 +5774,17 @@ msgid "Attachment"
 msgstr "Bijlage"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Datum"
 
@@ -5905,7 +5900,7 @@ msgstr "Doorzoeken van %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Doorzoeken van %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
@@ -6362,215 +6357,215 @@ msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 msgid "Scanning folder (%s)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "_Opnieuw zoeken"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Doel voor kopiëren is gelijk aan de huidige map."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de berichten."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Er zijn %d berichten gefilterd."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Nr."
 
@@ -6651,3 +6646,6 @@ msgstr "A_fsluiten"
 #: src/trayicon.c:139
 msgid "Sylpheed"
 msgstr "Sylpheed"
+
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Laatste nummer in map %s = %d\n"
diff --git a/po/pl.po b/po/pl.po
index 0e586f54..4e0a7819 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.9.8 \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -292,30 +292,25 @@ msgstr "nie można skrócić do zera.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Eksportowanie wiadomości z %s do %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nie można skopiować wiadomości %s do %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Nie można otworzyć pliku zaznaczeń.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "katalog źródłowy jest taki sam jak docelowy.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Ostatni numer w katalogu %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -324,7 +319,7 @@ msgstr ""
 "Plik \"%s\" już istnieje.\n"
 "Nie można utworzyć katalogu."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1023,7 +1018,7 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -1234,7 +1229,7 @@ msgstr "Brązowy"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Brak"
 
@@ -1571,7 +1566,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
@@ -1691,7 +1686,7 @@ msgstr "typ MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -2006,12 +2001,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2199,22 +2194,22 @@ msgstr "Śmietnik"
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
@@ -2338,22 +2333,22 @@ msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2363,26 +2358,26 @@ msgstr ""
 "(jeśli ma zostać utworzony katalog w celu przechowywania\n"
 "innych wiadomości, należy dołączyć \"/\" na końcu nazwy)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2391,12 +2386,12 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2407,21 +2402,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2430,34 +2425,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -2473,7 +2468,7 @@ msgstr "Temat:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -3540,8 +3535,8 @@ msgstr "Tworzenie głównego okna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -3847,25 +3842,25 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Wynik polecenia"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5785,17 +5780,17 @@ msgid "Attachment"
 msgstr "Załącznik"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Data"
 
@@ -5911,7 +5906,7 @@ msgstr "Przeszukiwanie katalogu %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
@@ -6379,231 +6374,231 @@ msgstr "brak niektórych znaczników, czy wykonać ?"
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Nie ma więcej nieprzeczytanych wiadomości"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomości."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Nie ma więcej nowych wiadomości"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Brak nowych wiadomości"
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Nie ma więcej zaznaczonych wiadomości"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpoczać wyszukiwanie od końca?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomości"
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomości."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Łączenie wiadomości wg tematu..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " element(ów) wybrany(o)"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Nr"
 
@@ -6691,6 +6686,9 @@ msgstr "Koniec programu"
 msgid "Sylpheed"
 msgstr "Dawny Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Ostatni numer w katalogu %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Niepoprawne polecenie podglądu MIME: '%s'"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index da27338b..86c45ea6 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-03-29 10:12-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -295,30 +295,25 @@ msgstr "não foi possível zerar o mailbox.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportando mensagens de %s em %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Não foi possível abrir o arquivo de marcas.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "pastas de origem e destino são idênticas.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiando mensagem %s%c%d para %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Último número no diretório %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +322,7 @@ msgstr ""
 "O arquivo `%s' já existe.\n"
 "Não foi possível criar a pasta."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1025,7 +1020,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -1234,7 +1229,7 @@ msgstr "Marrom"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1566,7 +1561,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -1689,7 +1684,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Tamanho"
 
@@ -1999,12 +1994,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2193,22 +2188,22 @@ msgstr "Lixeira"
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, 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:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
@@ -2330,22 +2325,22 @@ msgstr "Checar novas mensagens em todas as pastas..."
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,26 +2350,26 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Não foi possível renomear a pasta '%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2383,11 +2378,11 @@ msgstr ""
 "Apagar a pasta de busca '%s' ?\n"
 "As mensagens reais não serão apagadas."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2400,20 +2395,20 @@ msgstr ""
 "\n"
 "Quer realmente apagá-las?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2417,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -2465,7 +2460,7 @@ msgstr "Assunto:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -3533,8 +3528,8 @@ msgstr "Criando janela principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -3859,24 +3854,24 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "A mensagem será impressa com o seguinte comando:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Comando padrão de impressão)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5766,17 +5761,17 @@ msgid "Attachment"
 msgstr "Anexo"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Data"
 
@@ -5892,7 +5887,7 @@ msgstr "Procurando %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Procurando %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Sem data)"
 
@@ -6349,214 +6344,214 @@ msgstr "Algumas marcas foram deixadas. Processá-las?"
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "Procurar _novamente"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens não lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do início?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens etiquetadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem não lida encontrada. Procurar do início ?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d apagadas"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d não lidas, %d  no total (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d não lidas, %d no total"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensgens..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Quer realmente apagar a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Nº"
 
@@ -6638,6 +6633,9 @@ msgstr "Sai_r"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Último número no diretório %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "O comando do visualizador MIME é inválido: `%s'"
 
diff --git a/po/ro.po b/po/ro.po
index 0c253aa7..4c4f6ae0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-04-17 02:04+0200\n"
 "Last-Translator: Cristian Secară <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -301,30 +301,25 @@ msgstr "nu se poate reteza la zero căsuţa poştală.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportare mesaje din %s în %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nu se poate copia mesajului %s în %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Nu se poate deschide fişierul de marcaj.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "folderul sursă este identic cu cel destinaţie.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Copiere mesaj %s%c%d în %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Ultimul număr din directorul %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -333,7 +328,7 @@ msgstr ""
 "Fişierul '%s' există deja.\n"
 "Nu se poate crea folderul."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1048,7 +1043,7 @@ msgstr ""
 "Doriţi să ştergeţi folderul ŞI toate adresele din '%s' ?\n"
 "Dacă ştergeţi doar folderul, adresele vor fi mutate în folderul părinte."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Ştergere folder"
 
@@ -1258,7 +1253,7 @@ msgstr "Maro"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Nimic"
 
@@ -1591,7 +1586,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nu se poate obţine o parte a mesajului multiparte."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
@@ -1716,7 +1711,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Dimensiune"
 
@@ -2028,12 +2023,12 @@ msgstr "Editează folder"
 msgid "Input the new name of folder:"
 msgstr "Introduceţi noul nume al folderului:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Folder nou"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Introduceţi numele noului folder:"
 
@@ -2224,22 +2219,22 @@ msgstr "Gunoi"
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Folder nou"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele folderului."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Folderul '%s' există deja."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Folderul '%s' nu a putut fi creat."
@@ -2361,22 +2356,22 @@ msgstr "Verifică pentru mesaje noi în toate folderele..."
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Este selectat folderul %s\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descărcare mesaje în %s..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A avut loc o eroare în timpul descărcării mesajelor în '%s' ."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2386,26 +2381,26 @@ msgstr ""
 "(dacă doriţi să creaţi un folder care să conţină subfoldere,\n"
 " adăugaţi '/' la sfârşitul numelui)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceţi noul nume pentru '%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Redenumeşte folder"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nu se poate redenumi folderul '%s'"
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nu se poate muta folderul '%s'"
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2414,11 +2409,11 @@ msgstr ""
 "Ştergeţi folderul de căutare '%s' ?\n"
 "Mesajele reale NU sunt şterse de pe disc."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Şterge folderul pentru căutare"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2431,23 +2426,23 @@ msgstr ""
 "\n"
 "Chiar doriţi să ştergeţi ?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nu se poate şterge folderul '%s'."
 
 # hm ? nu merge goleşte gunoiul cu fraza următoare, sau trebuie reformulată fraza următoare
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Golire gunoi"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Ştergeţi toate mesajele din containerul de gunoi ?"
 
 # sau ştergeţi ?
 # sau retrageţi ?
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2456,34 +2451,34 @@ msgstr ""
 "Chiar ştergeţi căsuţa poştală '%s' ?\n"
 "(Mesajele NU sunt şterse de pe disc)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Şterge căsuţa poştală"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sigur ştergeţi contul IMAP4 '%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Şterge cont IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sigur ştergeţi newsgroup-ul '%s' ?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Şterge newsgroup"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sigur ştergeţi contul de ştiri '%s' ?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Şterge cont de ştiri"
 
@@ -2499,7 +2494,7 @@ msgstr "Subiect:"
 msgid "Creating header view...\n"
 msgstr "Creare vedere header...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
@@ -3586,8 +3581,8 @@ msgstr "Creare fereastră principală...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -3924,25 +3919,25 @@ msgstr "Ataşamente"
 msgid "Message View - Sylpheed"
 msgstr "Vizualizare mesaje - Syplheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nu se poate salva fişierul '%s'."
 
 # hm ?
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Mesajul va fi imprimat cu următoarea comandă:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Comandă de imprimare predefinită)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5861,17 +5856,17 @@ msgid "Attachment"
 msgstr "Ataşament"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Expeditor"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Dată"
 
@@ -5988,7 +5983,7 @@ msgstr "Căutare %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Căutare %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
@@ -6453,214 +6448,214 @@ msgstr "Au mai rămas nişte marcaje. Doriţi să fie procesate ?"
 msgid "Scanning folder (%s)..."
 msgstr "Scanare folder (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "_Caută din nou"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Nu mai există mesaje necitite"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Căutaţi de la sfârşit ?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Nu există mesaje necitite."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Nu s-a găsit nici un mesaj necitit. Mergeţi la folderul următor ?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Nu mai există mesaje noi"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj nou. Căutaţi de la sfârşit ?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Nu există mesaje noi."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Nu s-a găsit nici un mesaj nou. Mergeţi la folderul următor ?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Nu mai există mesaje marcate"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutaţi de la sfârşit ?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Nu există mesaje marcate."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaj marcat. Căutaţi de la început ?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Nu mai există mesaje etichetate"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Nu s-a găsit nici un mesaj etichetat. Căutaţi de la sfârşit ?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Nu există mesaje etichetate"
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nu s-a găsit nici un mesaje etichetat. Căutaţi de la început ?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Atracţie mesaje după subiect..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d şters(e)"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mutat(e)"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiat(e)"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " elemente selectate"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d noi, %d necitite, %d în total (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nou(i), %d necitit(e), %d în total"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Sortare sumar..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tSetare sumar din datele din mesaj..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Setare sumar din datele din mesaj..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache sumar (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ştergere\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Ştergere mesaj(e)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Sigur doriţi să ştergeţi mesajul(ele) de la gunoi ?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Ştergere mesaje duplicate..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Destinaţia este aceeaşi cu folderul curent."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este setat pentru copiere în %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Destinaţia pentru copiere este aceeaşi cu folderul curent."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "A avut loc o eroare în timpul procesării mesajelor."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Construire fire de discuţie..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuţie..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d messaj(e) au fost filtrate."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Nu."
 
@@ -6742,3 +6737,6 @@ msgstr "_Ieşire"
 #: src/trayicon.c:139
 msgid "Sylpheed"
 msgstr "Sylpheed"
+
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Ultimul număr din directorul %s = %d\n"
diff --git a/po/ru.po b/po/ru.po
index 6c4fac3b..b2bc93f1 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-06-09 14:30+0400\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -295,30 +295,25 @@ msgstr "не удалось обрезать почтовый ящик до ну
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Экспорт сообщений из %s в %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не удалось скопировать сообщение %s в %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Не удалось открыть файл пометок.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "исходная папка совпадает с папкой назначения.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копирование сообщения %s%c%d в %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Последний номер в каталоге %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +322,7 @@ msgstr ""
 "Файл \"%s\" уже существует.\n"
 "Нельзя создать папку с таким же именем."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1028,7 +1023,7 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -1236,7 +1231,7 @@ msgstr "Коричневый"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Нет"
 
@@ -1568,7 +1563,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
@@ -1690,7 +1685,7 @@ msgstr "Тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Размер"
 
@@ -2000,12 +1995,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2193,22 +2188,22 @@ msgstr "Корзина"
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ \"%c\" не может входить в имя папки."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка \"%s\" уже существует."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку \"%s\"."
@@ -2330,22 +2325,22 @@ msgstr "Проверка новых сообщений во всех папка�
 msgid "Junk"
 msgstr "Спам"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из \"%s\"."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,26 +2350,26 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте \"/\" в конец имени)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для \"%s\":"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не удалось переименовать папку \"%s\"."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не удалось переместить папку \"%s\"."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2383,11 +2378,11 @@ msgstr ""
 "Удалить папку поиска \"%s\"?\n"
 "Это не приведёт к удалению сообщений."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Удалить папку поиска"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2400,20 +2395,20 @@ msgstr ""
 "\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки \"%s\"."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2417,34 @@ msgstr ""
 "Удалить почтовый ящик \"%s\"?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учётную запись IMAP4 \"%s\"?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Удалить учётную запись IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей \"%s\"?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учётную запись новостей \"%s\"?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Удалить учётную запись новостей"
 
@@ -2465,7 +2460,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -3531,8 +3526,8 @@ msgstr "Создание главного окна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -3858,24 +3853,24 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr "Окно сообщения - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла \"%s\"."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Сообщение будет напечатано с помощью следующей команды:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Команда печати по умолчанию)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5765,17 +5760,17 @@ msgid "Attachment"
 msgstr "Вложение"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Дата"
 
@@ -5891,7 +5886,7 @@ msgstr "Поиск в папке \"%s\"..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Поиск в папке \"%s\" (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
@@ -6348,214 +6343,214 @@ msgstr "Несколько меток осталось. Обработать и�
 msgid "Scanning folder (%s)..."
 msgstr "Просмотр папки (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "Искать снова"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Нет непрочитанных сообщений"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Непрочитанные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Нет непрочитанных сообщений."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Непрочитанные сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Нет новых сообщений"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Новые сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Нет новых сообщений."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Новые сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Нет выделенных цветом сообщений"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Нет выделенных цветом сообщений."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Группировка сообщений по темам..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d удалено"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перемещено"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопировано"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " сообщений выбрано"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d непрочитанных, %d всего (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d непрочитанных, %d всего"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удалённое\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Удаление повторяющихся сообщений..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Номер"
 
@@ -6637,6 +6632,9 @@ msgstr "Выход"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Последний номер в каталоге %s = %d\n"
+
 #~ msgid "can't lock %s with fcntl\n"
 #~ msgstr "не удалось заблокировать %s с помощью fcntl\n"
 
diff --git a/po/sk.po b/po/sk.po
index d37c359e..a500463d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -296,30 +296,25 @@ msgstr "nemôžem skrátiť mailbox na nulovú dĺžku.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exportujem správy z %s do %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "nemôžem kopírovať správu %s do %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Nemôžem označiť súbor so značkami.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "zdrojový priečinok je ten istý ako cieľový.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Posledné číslo v priečinku %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -328,7 +323,7 @@ msgstr ""
 "Súbor '%s' už existuje.\n"
 "Priečinok sa nedá vytvoriť."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1024,7 +1019,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
@@ -1235,7 +1230,7 @@ msgstr "Hnedá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Žiadna"
 
@@ -1604,7 +1599,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
@@ -1726,7 +1721,7 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -2043,12 +2038,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2237,22 +2232,22 @@ msgstr "Odpadkový kôš"
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
@@ -2378,22 +2373,22 @@ msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2403,26 +2398,26 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2431,12 +2426,12 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2447,21 +2442,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2470,34 +2465,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2513,7 +2508,7 @@ msgstr "Predmet:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -3605,8 +3600,8 @@ msgstr "Vytváram hlavné okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3916,25 +3911,25 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Vykonať"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5897,17 +5892,17 @@ msgid "Attachment"
 msgstr "Príloha"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Dátum"
 
@@ -6024,7 +6019,7 @@ msgstr "Prehľadávam priečinok %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
@@ -6489,217 +6484,217 @@ msgstr "Ostali nejaké značky. Spracovať?"
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Hľadať znova"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " položiek zvolených"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Č."
 
@@ -6788,6 +6783,9 @@ msgstr "Ukončiť"
 msgid "Sylpheed"
 msgstr "Starší Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Posledné číslo v priečinku %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Príkazový riadok prehliadača MIME je neplatný: '%s'"
 
diff --git a/po/sl.po b/po/sl.po
index b815a51f..b61e539a 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -299,30 +299,25 @@ msgstr "ne morem prisekati poštnega predala na ničlo.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvažam sporočila iz %s v %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne morem prepisati sporočila %s v %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Ne morem odpreti označene datoteke.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "Izvorna mapa je identična ciljni.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Zadnja številka v imeniku %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -331,7 +326,7 @@ msgstr ""
 "Datoteka `%s' že obstaja.\n"
 "Ne morem narediti imenika."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1030,7 +1025,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
@@ -1240,7 +1235,7 @@ msgstr "Rjava"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Nič"
 
@@ -1610,7 +1605,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
@@ -1731,7 +1726,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Velikost"
 
@@ -2048,12 +2043,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2241,22 +2236,22 @@ msgstr "Smeti"
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
@@ -2383,22 +2378,22 @@ msgstr "Preverjam nova sporočila v vseh mapah..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, 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:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2408,26 +2403,26 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2436,12 +2431,12 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2452,21 +2447,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2475,34 +2470,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2518,7 +2513,7 @@ msgstr "Zadeva:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -3610,8 +3605,8 @@ msgstr "Ustvarjam glavno okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -3920,25 +3915,25 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvedi"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5900,17 +5895,17 @@ msgid "Attachment"
 msgstr "Priloga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Datum"
 
@@ -6026,7 +6021,7 @@ msgstr "Preiskujem mapo %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
@@ -6490,218 +6485,218 @@ msgstr "Nekaj oznak je ostalo. Naj obdelam?"
 msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Nobeno neprebrano sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Ni neprebranih sporočil."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nobeno neprebrano sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Ni novih sporočil."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Ni več označenih sporočil"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Ni označenih sporočil."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Ni več sporočil z oznako"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Ni sporočil z oznako"
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Privlačim sporočila po zadevi..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Ne."
 
@@ -6791,6 +6786,9 @@ msgstr "Končaj"
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Zadnja številka v imeniku %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Ukazna vrstica pregledovalnika MIME je neveljavna: `%s'"
 
diff --git a/po/sr.po b/po/sr.po
index 48e1568c..e154bad4 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -300,30 +300,25 @@ msgstr "ne mogu skratiti sanduče na nulu.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Izvozim poruke iz %s u %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "ne mogu kopirati poruku %s u %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Ne mogu otvoriti označenu datoteku.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "izvorni direktorijum jednak je destinaciji.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Posednji broj u direktoriju %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -332,7 +327,7 @@ msgstr ""
 "Datoteka `%s' već postoji.\n"
 "Ne mogu napraviti direktorijum."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1031,7 +1026,7 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
@@ -1234,7 +1229,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Ništa"
 
@@ -1604,7 +1599,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1726,7 +1721,7 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Veličina"
 
@@ -2043,12 +2038,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2236,22 +2231,22 @@ msgstr "Smeće"
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, 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:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
@@ -2378,22 +2373,22 @@ msgstr "Proveravanje novih poruka u svim direktorijumima..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, 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:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2403,26 +2398,26 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2431,12 +2426,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2447,21 +2442,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2470,34 +2465,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2513,7 +2508,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -3606,8 +3601,8 @@ msgstr "Kreiranje glavnih prozora...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -3916,25 +3911,25 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5895,17 +5890,17 @@ msgid "Attachment"
 msgstr "Dodatak"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Datum"
 
@@ -6021,7 +6016,7 @@ msgstr "Pretražujem direktorijum %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6489,217 +6484,217 @@ msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Ne."
 
@@ -6789,6 +6784,9 @@ msgstr "Izlaz"
 msgid "Sylpheed"
 msgstr "Stari Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Posednji broj u direktoriju %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Naredba MIME nije ispravna: `%s'"
 
diff --git a/po/sv.po b/po/sv.po
index 02fc4e83..bee6283d 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -293,30 +293,25 @@ msgstr "kan inte korta av brevlåda till noll.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Exporterar meddelanden från %s till %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "kan inte kopiera meddelande %s till %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Kan inte öppna markeringsfil.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "ursprungsmappen är identisk med dest.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Kopierar meddelande %s%c%d till %s...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Sista tal i mapp %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -325,7 +320,7 @@ msgstr ""
 "Filen \"%s\" finns redan.\n"
 "Kan inte skapa mapp."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1028,7 +1023,7 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -1231,7 +1226,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Ingen"
 
@@ -1568,7 +1563,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
@@ -1691,7 +1686,7 @@ msgstr "MIME-typ"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Storlek"
 
@@ -2002,12 +1997,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2194,22 +2189,22 @@ msgstr "Papperskorg"
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
@@ -2332,22 +2327,22 @@ msgstr "Letar efter nya meddelanden i alla mappar..."
 msgid "Junk"
 msgstr "Skräp"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2357,26 +2352,26 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2385,12 +2380,12 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2403,20 +2398,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2425,34 +2420,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2468,7 +2463,7 @@ msgstr "Ämne:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -3542,8 +3537,8 @@ msgstr "Skapar huvudfönster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -3845,24 +3840,24 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Meddelandet kommer att skrivas ut med följande kommando:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Förvalt utskriftkommando)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5768,17 +5763,17 @@ msgid "Attachment"
 msgstr "Bilaga"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Datum"
 
@@ -5895,7 +5890,7 @@ msgstr "Söker igenom mapp %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
@@ -6359,214 +6354,214 @@ msgstr "Några markeringar finns kvar. Behandla dem?"
 msgid "Scanning folder (%s)..."
 msgstr "Söker igenom mapp (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "_Sök igen"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Inga färgade meddelanden."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d olästa, %d totalt (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d olästa, %d totalt"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Nr."
 
@@ -6653,6 +6648,9 @@ msgstr "Avsluta"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Sista tal i mapp %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "MIME-visningskommandot är felaktigt:\"%s\""
 
diff --git a/po/tr.po b/po/tr.po
index 07e84b78..cf57b142 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -301,30 +301,25 @@ msgstr "posta kutusu sıfırlanamıyor.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "%s daki mesajlar %s a aktarılıyor...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "mesaj %s dan %s a kopyalanamadı\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "işaretli dosya açılamadı.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "kaynak dizini hedef dizinle aynı.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Dizindeki son numara %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -333,7 +328,7 @@ msgstr ""
 "%s dosyası zaten bulunuyor.\n"
 "Dizin oluşturulamadı."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1028,7 +1023,7 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1236,7 +1231,7 @@ msgstr "Kahverengi"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1597,7 +1592,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
@@ -1719,7 +1714,7 @@ msgstr "MIME türü"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Boyut"
 
@@ -2036,12 +2031,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2229,22 +2224,22 @@ msgstr "Çöp"
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
@@ -2368,22 +2363,22 @@ msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2393,26 +2388,26 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2421,12 +2416,12 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2437,21 +2432,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2460,34 +2455,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2503,7 +2498,7 @@ msgstr "Konu:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -2970,7 +2965,7 @@ msgstr ""
 
 #: src/mainwindow.c:490
 msgid "/_File/_Folder"
-msgstr "/_Dosya/D_izin"
+msgstr "/_Dosya/Di_zin"
 
 #: src/mainwindow.c:491
 msgid "/_File/_Folder/Create _new folder..."
@@ -3111,7 +3106,7 @@ msgstr "/_Görünüm/Ayrı _ileti görünümü"
 
 #: src/mainwindow.c:554
 msgid "/_View/_Sort"
-msgstr "/_Görünüm/_Sırala"
+msgstr "/_Görünüm/Sıra_la"
 
 #: src/mainwindow.c:555
 msgid "/_View/_Sort/by _number"
@@ -3168,11 +3163,11 @@ msgstr "/_Görünüm/Sıra_la/---"
 
 #: src/mainwindow.c:570
 msgid "/_View/_Sort/Ascending"
-msgstr "/_Görünüm/_Sırala/Artan sırala"
+msgstr "/_Görünüm/Sıra_la/Artan sırala"
 
 #: src/mainwindow.c:571
 msgid "/_View/_Sort/Descending"
-msgstr "/_Görünüm/_Sırala/Azalan sırala"
+msgstr "/_Görünüm/Sıra_la/Azalan sırala"
 
 #: src/mainwindow.c:573
 msgid "/_View/_Sort/_Attract by subject"
@@ -3196,7 +3191,7 @@ msgstr "/_Görünüm/_Görüntü öğesini seç..."
 
 #: src/mainwindow.c:581
 msgid "/_View/_Go to"
-msgstr "/_Görünüm/_Git/"
+msgstr "/_Görünüm/_Git"
 
 #: src/mainwindow.c:582
 msgid "/_View/_Go to/_Prev message"
@@ -3229,23 +3224,23 @@ msgstr "/_Görünüm/_Git/Sonraki _yeni ileti"
 
 #: src/mainwindow.c:593
 msgid "/_View/_Go to/Prev _marked message"
-msgstr "/_Görünüm/Gi_t/Önceki _işaretli ileti"
+msgstr "/_Görünüm/_Git/Önceki _işaretli ileti"
 
 #: src/mainwindow.c:595
 msgid "/_View/_Go to/Next m_arked message"
-msgstr "/_Görünüm/Gi_t/S_onraki işaretli ileti"
+msgstr "/_Görünüm/_Git/S_onraki işaretli ileti"
 
 #: src/mainwindow.c:598
 msgid "/_View/_Go to/Prev _labeled message"
-msgstr "/_Görünüm/Gi_t/Ö_nceki _etiketli ileti"
+msgstr "/_Görünüm/_Git/Ö_nceki _etiketli ileti"
 
 #: src/mainwindow.c:600
 msgid "/_View/_Go to/Next la_beled message"
-msgstr "/_Görünüm/Gi_t/Son_raki etiketli ileti"
+msgstr "/_Görünüm/_Git/Son_raki etiketli ileti"
 
 #: src/mainwindow.c:603
 msgid "/_View/_Go to/Other _folder..."
-msgstr "/_Görünüm/Gi_t/_Başka dizine git..."
+msgstr "/_Görünüm/_Git/_Başka dizine git..."
 
 #: src/mainwindow.c:612 src/messageview.c:161
 #, fuzzy
@@ -3582,8 +3577,8 @@ msgstr "Yeni pencere oluşturuluyor...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -3888,25 +3883,25 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Komut çalıştır"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5844,17 +5839,17 @@ msgid "Attachment"
 msgstr "Ek"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Tarih"
 
@@ -5970,7 +5965,7 @@ msgstr "%s dizini taranıyor..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
@@ -6440,215 +6435,215 @@ msgstr "Bazı işaretler bırakılmış. İşlemeye devam edilsin mi?"
 msgid "Scanning folder (%s)..."
 msgstr "Dizin taranıyor (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Başka okunmamış ileti yok"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Okunmamış ileti yok."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Okunamamış ileti yok. Diğer dizine geçilsin mi?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Başka ileti yok"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren aransın mı?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Yeni ileti yok. Sonraki dizine geçilsin mi?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Başka işaretlenmiş posta yok"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "İşaretlenmiş ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "İşaretlenmiş ileti yok."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "İşaretlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Başka etiketlenlenmiş ileti yok. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Başka etiketlenmiş ileti yok."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Konularına göre postalar çekiliyor..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d taşındı"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyalandı"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " öğe seçildi"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmamış, toplam %d (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmamış, toplam %d"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Hayır."
 
@@ -6740,6 +6735,9 @@ msgstr "Çık"
 msgid "Sylpheed"
 msgstr "Eski Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Dizindeki son numara %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "MIME görüntüleyici komutu geçersiz: `%s'"
 
diff --git a/po/uk.po b/po/uk.po
index f0598605..3421f361 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.2.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-04-13 00:34+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian\n"
@@ -298,30 +298,25 @@ msgstr "не вдалось обрізати скриньку до нуля.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Експортуємо листи з %s в %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "не вдалось копіювати %s в %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Не вдалось відкрити файл позначок.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "папка призначення ідентична до вихідної.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Копіюємо лист %s%c%d в %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Останній номер в каталозі %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -330,7 +325,7 @@ msgstr ""
 "Файл `%s' вже існує.\n"
 "Неможливо створити папку."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1031,7 +1026,7 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Видалити папку"
 
@@ -1233,7 +1228,7 @@ msgstr "Коричневий"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Ніякий"
 
@@ -1565,7 +1560,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
@@ -1687,7 +1682,7 @@ msgstr "тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Розмір"
 
@@ -1996,12 +1991,12 @@ msgstr "Редагувати папку"
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2188,22 +2183,22 @@ msgstr "Кошик"
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
@@ -2325,22 +2320,22 @@ msgstr "Перевірити за новими листами у всіх пап
 msgid "Junk"
 msgstr "Мотлох"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2350,26 +2345,26 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не вдалось перейменувати папку `%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2378,11 +2373,11 @@ msgstr ""
 "Справді видалити папку пошуку `%s' ?\n"
 "(Листи НЕ видаляються з диска.)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Видалити папку пошуку"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2395,20 +2390,20 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2417,34 +2412,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -2460,7 +2455,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Без відправника)"
 
@@ -3525,8 +3520,8 @@ msgstr "Створюємо головне вікно...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "виконано.\n"
 
@@ -3850,24 +3845,24 @@ msgstr "Вкладення"
 msgid "Message View - Sylpheed"
 msgstr "Зміст листа - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Лист буде надруковано наступною командою:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Команда друку за замовчуванням)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5750,17 +5745,17 @@ msgid "Attachment"
 msgstr "Вкладення"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Дата"
 
@@ -5875,7 +5870,7 @@ msgstr "Шукаємо %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Шукаємо %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Без дати)"
 
@@ -6332,214 +6327,214 @@ msgstr "Залишились деякі позначки. Опрацювати?"
 msgid "Scanning folder (%s)..."
 msgstr "Перечитуємо папку (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "Шукати знову"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Більше немає непрочитаних листів"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Не знайдено непрочитаних листів. Шукати з кінця?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Немає непрочитаних листів"
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Не знайдено непрочитаних листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Більше немає нових листів"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Не знайдено нових листів. Шукати з кінця?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Немає нових листів"
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Не знайдено нових листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Більше немає позначених листів"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Не знайдено позначених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Немає позначених листів."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не знайдено позначених листів. Шукати з початку?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Більше немає виділених листів"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Не знайдено виділених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Немає виділених листів"
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не знайдено виділених листів. Шукати з початку?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Групування листів за темами..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d видалено"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d переміщено"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопійовано"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " записів обрано"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нових, %d непрочитаних, %d загалом (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нових, %d непрочитаних, %d загалом"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Сортуємо список..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tФормуємо список з даних листів..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Номер"
 
@@ -6621,6 +6616,9 @@ msgstr "Вихід"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Останній номер в каталозі %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Командний рядок переглядача MIME невірний: `%s'"
 
diff --git a/po/vi.po b/po/vi.po
index c6c83ccd..4df98526 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+0900\n"
 "PO-Revision-Date: 2006-04-16 22:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -291,30 +291,25 @@ msgstr "không thể giảm số lượng hộp thư xuống 0.\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "Xuất thư từ %s sang %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "không thể chép thư %s tới %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "Không thể mở tập tin đánh đấu.\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "thư mục nguồn cũng chính là thư mục gốc.\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "Đang chép thư %s%c%d tới %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "Số cuối trong thư mục %s = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -323,7 +318,7 @@ msgstr ""
 "Tập tin `%s' đã có trước.\n"
 "Không thể tạo thư mục."
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1008,7 +1003,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:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
@@ -1214,7 +1209,7 @@ msgstr "Nâu"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "Không"
 
@@ -1546,7 +1541,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
@@ -1668,7 +1663,7 @@ msgstr "Kiểu MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "Kích thước"
 
@@ -1977,12 +1972,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:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2169,22 +2164,22 @@ msgstr "Thùng rác"
 msgid "Drafts"
 msgstr "Nháp"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "Thư mục mới"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, 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:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Không tạo được thư mục `%s'."
@@ -2306,22 +2301,22 @@ msgstr "Kiểm tra thư mới trong mọi thư mục..."
 msgid "Junk"
 msgstr "Rác"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Thư mục %s được chọn\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Có lỗi khi tải thư về trong `%s'."
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2331,26 +2326,26 @@ msgstr ""
 "(nếu bạn muốn tạo một thư mục để lưu thư mục con,\n"
 " thêm `/' vào cuối tên)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Đặt tên cho `%s':"
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Không thể đổi tên thư mục `%s'."
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2359,11 +2354,11 @@ msgstr ""
 "Xoá thư mục tìm kiếm `%s' ?\n"
 "Thư sẽ không bị xoá khỏi ổ cứng."
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 msgid "Delete search folder"
 msgstr "Xoá thư mục tìm kiếm"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2376,20 +2371,20 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục '%s'."
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2398,34 +2393,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:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, 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:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -2441,7 +2436,7 @@ msgstr "Tiêu đề:"
 msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -3506,8 +3501,8 @@ msgstr "Đang tạo cửa sổ chính...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -3831,24 +3826,24 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr "Khung xem thư - Sylpheed"
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr "Thư sẽ được in ra với dòng lệnh sau:"
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 msgid "(Default print command)"
 msgstr "(Lệnh in mặc định)"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "In ấn"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5728,17 +5723,17 @@ msgid "Attachment"
 msgstr "Đính kèm"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "Thời gian"
 
@@ -5853,7 +5848,7 @@ msgstr "Đang tìm %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Đang tìm %s (%d / %d)..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
@@ -6308,214 +6303,214 @@ msgstr "Vẫn còn sót một số dấu. Xử lí chúng?"
 msgid "Scanning folder (%s)..."
 msgstr "Đang quét thư mục (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "_Tìm lại"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "Không có thêm thư chưa đọc"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "Không thấy thư nào chưa đọc. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "Không có thư nào chưa đọc."
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "Không thấy thư nào chưa đọc. Chuyển sang thư mục tiếp theo?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "Không có thêm thư mới"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "Không có thư mới. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "Không có thư mới."
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "Không thấy thư mới nào. Tìm trong thư mục tiếp theo?"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "Không có thêm thư được đánh dấu"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "Không có thư nào được dánh dấu."
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ đầu?"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "Không thấy nào được gán nhãn. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "Không có thư được gán nhãn."
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Không thấy thư nào được gán nhãn. Tìm từ đầu?"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "Tập trung thư theo tiêu đề..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "đã xoá %d"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "đã chuyển %s%d"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "đã chép %s%d"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " mục được chọn"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d mới, %d chưa đọc, %d tổng số (%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d mới, %d chưa đọc, %d tổng số"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "Đang sắp xếp bảng tóm tắt..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\tĐang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại"
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc (%d / %d)..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "Số "
 
@@ -6597,6 +6592,9 @@ msgstr "_Thoát"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "Số cuối trong thư mục %s = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "Lệnh xem MIME không hợp lệ: `%s'"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 4a7743e5..204e7819 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -296,30 +296,25 @@ msgstr "无法将邮箱删除为空。\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "正在从 %s 导出信件到 %s...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "无法复制邮件 %s 到 %s\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "无法打开标记文件。\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "源文件夹与目的文件夹是同一个。\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "目录 %s 的最后一个序号 = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -328,7 +323,7 @@ msgstr ""
 "文件“%s”已存在。\n"
 "无法创建文件件。"
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1021,7 +1016,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -1222,7 +1217,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "没有"
 
@@ -1562,7 +1557,7 @@ msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -1683,7 +1678,7 @@ msgstr "MIME 类型"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "大小"
 
@@ -1998,12 +1993,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2191,22 +2186,22 @@ msgstr "废件箱"
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
@@ -2330,22 +2325,22 @@ msgstr "正在检查所有文件夹中的新邮件..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,26 +2350,26 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2383,12 +2378,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2399,21 +2394,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2417,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2465,7 +2460,7 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -3536,8 +3531,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3841,25 +3836,25 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "执行命令"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5777,17 +5772,17 @@ msgid "Attachment"
 msgstr "附件"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "日期"
 
@@ -5903,7 +5898,7 @@ msgstr "正在扫描文件夹 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(没有日期)"
 
@@ -6369,215 +6364,215 @@ msgstr "有一些剩余标记。处理吗？"
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 #, fuzzy
 msgid "_Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "No."
 
@@ -6668,6 +6663,9 @@ msgstr "退出"
 msgid "Sylpheed"
 msgstr "旧式的Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "目录 %s 的最后一个序号 = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "MIME察看器命令行无效：“%s”"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 4e825c01..a158e49f 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-16 16:49+0900\n"
+"POT-Creation-Date: 2006-06-27 12:57+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"
@@ -295,30 +295,25 @@ msgstr "無法清除信箱。\n"
 msgid "Exporting messages from %s into %s...\n"
 msgstr "將郵件由 %s 匯出到 %s 中...\n"
 
-#: libsylph/mh.c:423
+#: libsylph/mh.c:427
 #, c-format
 msgid "can't copy message %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/mh.c:498 libsylph/mh.c:621
+#: libsylph/mh.c:502 libsylph/mh.c:625
 msgid "Can't open mark file.\n"
 msgstr "無法開啟標記的檔案。\n"
 
-#: libsylph/mh.c:505 libsylph/mh.c:627
+#: libsylph/mh.c:509 libsylph/mh.c:631
 msgid "the src folder is identical to the dest.\n"
 msgstr "來源與目的資料夾相同。\n"
 
-#: libsylph/mh.c:630
+#: libsylph/mh.c:634
 #, c-format
 msgid "Copying message %s%c%d to %s ...\n"
 msgstr "正在複製訊息 %s%c%d 到 %s ...\n"
 
-#: libsylph/mh.c:824
-#, c-format
-msgid "Last number in dir %s = %d\n"
-msgstr "目錄 %s 中最後的編號 = %d\n"
-
-#: libsylph/mh.c:867 libsylph/mh.c:880 src/main.c:147
+#: libsylph/mh.c:965 libsylph/mh.c:978 src/main.c:147
 #, c-format
 msgid ""
 "File `%s' already exists.\n"
@@ -327,7 +322,7 @@ msgstr ""
 "檔案「%s」已存在。\n"
 "無法產生資料夾。"
 
-#: libsylph/mh.c:1395
+#: libsylph/mh.c:1500
 #, c-format
 msgid ""
 "Directory name\n"
@@ -1024,7 +1019,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1672 src/folderview.c:2402
+#: src/addressbook.c:1672 src/folderview.c:2405
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -1227,7 +1222,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4801
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4797
 msgid "None"
 msgstr "無"
 
@@ -1564,7 +1559,7 @@ msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
 #: src/compose.c:2528 src/headerview.c:195 src/query_search.c:666
-#: src/summaryview.c:2154
+#: src/summaryview.c:2152
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1685,7 +1680,7 @@ msgstr "MIME 型態"
 
 #. S_COL_DATE
 #: src/compose.c:4322 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4944
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4940
 msgid "Size"
 msgstr "大小"
 
@@ -1996,12 +1991,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
-#: src/folderview.c:2157
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2154
+#: src/folderview.c:2160
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2161
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2188,22 +2183,22 @@ msgstr "刪除的郵件"
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
+#: src/foldersel.c:546 src/folderview.c:2158 src/folderview.c:2162
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
+#: src/foldersel.c:554 src/folderview.c:2170 src/folderview.c:2231
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
+#: src/foldersel.c:564 src/folderview.c:2180 src/folderview.c:2239
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:572 src/folderview.c:2184
+#: src/foldersel.c:572 src/folderview.c:2187
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
@@ -2326,22 +2321,22 @@ msgstr "檢查每個資料夾中的新郵件..."
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/folderview.c:1882
+#: src/folderview.c:1885
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:2037
+#: src/folderview.c:2040
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2074
+#: src/folderview.c:2077
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2152
+#: src/folderview.c:2155
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2351,26 +2346,26 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2216
+#: src/folderview.c:2219
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2217
+#: src/folderview.c:2220
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2248 src/folderview.c:2256
+#: src/folderview.c:2251 src/folderview.c:2259
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2326
+#: src/folderview.c:2329
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2392
+#: src/folderview.c:2395
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2379,12 +2374,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2394
+#: src/folderview.c:2397
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2399
+#: src/folderview.c:2402
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2397,20 +2392,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2431 src/folderview.c:2437
+#: src/folderview.c:2434 src/folderview.c:2440
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2473
+#: src/folderview.c:2476
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2474
+#: src/folderview.c:2477
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2513
+#: src/folderview.c:2516
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2419,34 +2414,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2515
+#: src/folderview.c:2518
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2565
+#: src/folderview.c:2568
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2566
+#: src/folderview.c:2569
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2719
+#: src/folderview.c:2722
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2720
+#: src/folderview.c:2723
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2770
+#: src/folderview.c:2773
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2771
+#: src/folderview.c:2774
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2462,7 +2457,7 @@ msgstr "主旨："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2157
+#: src/headerview.c:180 src/query_search.c:667 src/summaryview.c:2155
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -3525,8 +3520,8 @@ msgstr "建立主視窗...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1139 src/summaryview.c:2306 src/summaryview.c:2391
-#: src/summaryview.c:3947 src/summaryview.c:4076 src/summaryview.c:4434
+#: src/mainwindow.c:1139 src/summaryview.c:2304 src/summaryview.c:2389
+#: src/summaryview.c:3943 src/summaryview.c:4072 src/summaryview.c:4430
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3828,25 +3823,25 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:700 src/summaryview.c:3475
+#: src/messageview.c:700 src/summaryview.c:3473
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
 
-#: src/messageview.c:758 src/summaryview.c:3498
+#: src/messageview.c:758 src/summaryview.c:3496
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:759 src/summaryview.c:3499
+#: src/messageview.c:759 src/summaryview.c:3497
 #, fuzzy
 msgid "(Default print command)"
 msgstr "正在學習命令:"
 
-#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
+#: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3499
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:769 src/summaryview.c:3509
+#: src/messageview.c:769 src/summaryview.c:3507
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -5738,17 +5733,17 @@ msgid "Attachment"
 msgstr "附加檔案"
 
 #. S_COL_MIME
-#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4937
+#: src/prefs_summary_column.c:73 src/query_search.c:399 src/summaryview.c:4933
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
-#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4940
+#: src/prefs_summary_column.c:74 src/query_search.c:400 src/summaryview.c:4936
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
-#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4942
+#: src/prefs_summary_column.c:75 src/query_search.c:401 src/summaryview.c:4938
 msgid "Date"
 msgstr "日期"
 
@@ -5864,7 +5859,7 @@ msgstr "掃描資料夾 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/query_search.c:675 src/summaryview.c:2081
+#: src/query_search.c:675 src/summaryview.c:2079
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6328,214 +6323,214 @@ msgstr "某些郵件已被標記。要繼續嗎？"
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1325
+#: src/summaryview.c:1323
 msgid "_Search again"
 msgstr "再次搜尋(_S)"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1344 src/summaryview.c:1353
 msgid "No more unread messages"
 msgstr "沒有其他未讀郵件"
 
-#: src/summaryview.c:1347
+#: src/summaryview.c:1345
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1349
+#: src/summaryview.c:1347
 msgid "No unread messages."
 msgstr "沒有未讀郵件。"
 
-#: src/summaryview.c:1356
+#: src/summaryview.c:1354
 msgid "No unread message found. Go to next folder?"
 msgstr "沒有未讀郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1362 src/summaryview.c:1371
 msgid "No more new messages"
 msgstr "沒有其他新郵件"
 
-#: src/summaryview.c:1365
+#: src/summaryview.c:1363
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1367
+#: src/summaryview.c:1365
 msgid "No new messages."
 msgstr "沒有新郵件。"
 
-#: src/summaryview.c:1374
+#: src/summaryview.c:1372
 msgid "No new message found. Go to next folder?"
 msgstr "沒有新郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1382 src/summaryview.c:1391
+#: src/summaryview.c:1380 src/summaryview.c:1389
 msgid "No more marked messages"
 msgstr "沒有其他已標記郵件"
 
-#: src/summaryview.c:1383
+#: src/summaryview.c:1381
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1385 src/summaryview.c:1394
+#: src/summaryview.c:1383 src/summaryview.c:1392
 msgid "No marked messages."
 msgstr "沒有已標記郵件。"
 
-#: src/summaryview.c:1392
+#: src/summaryview.c:1390
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1400 src/summaryview.c:1409
+#: src/summaryview.c:1398 src/summaryview.c:1407
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/summaryview.c:1401
+#: src/summaryview.c:1399
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1403 src/summaryview.c:1412
+#: src/summaryview.c:1401 src/summaryview.c:1410
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之郵件。"
 
-#: src/summaryview.c:1410
+#: src/summaryview.c:1408
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1726
+#: src/summaryview.c:1724
 msgid "Attracting messages by subject..."
 msgstr "依主旨展開郵件中..."
 
-#: src/summaryview.c:1920
+#: src/summaryview.c:1918
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:1924
+#: src/summaryview.c:1922
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:1925 src/summaryview.c:1930
+#: src/summaryview.c:1923 src/summaryview.c:1928
 msgid ", "
 msgstr "， "
 
-#: src/summaryview.c:1929
+#: src/summaryview.c:1927
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:1944
+#: src/summaryview.c:1942
 msgid " item(s) selected"
 msgstr " 封已選擇"
 
-#: src/summaryview.c:1966
+#: src/summaryview.c:1964
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:1970
+#: src/summaryview.c:1968
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:2004
+#: src/summaryview.c:2002
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2241
+#: src/summaryview.c:2239
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2243
+#: src/summaryview.c:2241
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2350
+#: src/summaryview.c:2348
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2693
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2755
+#: src/summaryview.c:2753
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:2947
+#: src/summaryview.c:2945
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:3008
+#: src/summaryview.c:3006
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:3036
+#: src/summaryview.c:3034
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:3037
+#: src/summaryview.c:3035
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:3111
+#: src/summaryview.c:3109
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:3149
+#: src/summaryview.c:3147
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3209
+#: src/summaryview.c:3207
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3241
+#: src/summaryview.c:3239
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3307
+#: src/summaryview.c:3305
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3338
+#: src/summaryview.c:3336
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3546
+#: src/summaryview.c:3544
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3854 src/summaryview.c:3855
+#: src/summaryview.c:3850 src/summaryview.c:3851
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:4005 src/summaryview.c:4006
+#: src/summaryview.c:4001 src/summaryview.c:4002
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4299 src/summaryview.c:4355
+#: src/summaryview.c:4295 src/summaryview.c:4351
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4404
+#: src/summaryview.c:4400
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4405
+#: src/summaryview.c:4401
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4441
+#: src/summaryview.c:4437
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:4946
+#: src/summaryview.c:4942
 msgid "No."
 msgstr "No."
 
@@ -6621,6 +6616,9 @@ msgstr "離開"
 msgid "Sylpheed"
 msgstr "Sylpheed"
 
+#~ msgid "Last number in dir %s = %d\n"
+#~ msgstr "目錄 %s 中最後的編號 = %d\n"
+
 #~ msgid "MIME viewer command line is invalid: `%s'"
 #~ msgstr "開啟此 MIME 型態的命令是錯誤的：「%s」"