added 'Mark all read' to the folder context menu.

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

34 files changed, 2809 insertions, 3005 deletions

diff --git a/ChangeLog b/ChangeLog
index 1e57fef6..ef9023bd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-16
+
+	* libsylph/procmsg.[ch]
+	  src/folderview.c: added "Mark all read" to the folder context menu.
+
 2006-06-09
 
 	* version 2.2.6
diff --git a/ChangeLog.ja b/ChangeLog.ja
index cac21c82..52833c42 100644
--- a/ChangeLog.ja
+++ b/ChangeLog.ja
@@ -1,3 +1,9 @@
+2006-06-16
+
+	* libsylph/procmsg.[ch]
+	  src/folderview.c: フォルダのコンテキストメニューに「すべて読んだ
+	  ことにする」を追加。
+
 2006-06-09
 
 	* version 2.2.6
diff --git a/libsylph/procmsg.c b/libsylph/procmsg.c
index 3a47da3d..4cb56811 100644
--- a/libsylph/procmsg.c
+++ b/libsylph/procmsg.c
@@ -380,6 +380,40 @@ void procmsg_set_flags(GSList *mlist, FolderItem *item)
 	g_hash_table_destroy(mark_table);
 }
 
+static void mark_all_read_func(gpointer key, gpointer value, gpointer data)
+{
+	MSG_UNSET_PERM_FLAGS(*((MsgFlags *)value), MSG_NEW|MSG_UNREAD);
+}
+
+void procmsg_mark_all_read(FolderItem *item)
+{
+	GHashTable *mark_table;
+
+	debug_print("Marking all messages as read\n");
+
+	mark_table = procmsg_read_mark_file(item);
+	if (mark_table) {
+		g_hash_table_foreach(mark_table, mark_all_read_func, NULL);
+		procmsg_write_mark_file(item, mark_table);
+		hash_free_value_mem(mark_table);
+		g_hash_table_destroy(mark_table);
+	}
+
+	if (item->mark_queue) {
+		GSList *cur;
+		MsgInfo *msginfo;
+
+		for (cur = item->mark_queue; cur != NULL; cur = cur->next) {
+			msginfo = (MsgInfo *)cur->data;
+			MSG_UNSET_PERM_FLAGS
+				(msginfo->flags, MSG_NEW|MSG_UNREAD);
+		}
+		item->mark_dirty = TRUE;
+	}
+
+	item->new = item->unread = 0;
+}
+
 static FolderSortType cmp_func_sort_type;
 
 GSList *procmsg_sort_msg_list(GSList *mlist, FolderSortKey sort_key,
diff --git a/libsylph/procmsg.h b/libsylph/procmsg.h
index f61b6f9b..3fc7e119 100644
--- a/libsylph/procmsg.h
+++ b/libsylph/procmsg.h
@@ -221,6 +221,7 @@ GSList *procmsg_read_cache		(FolderItem	*item,
 					 gboolean	 scan_file);
 void	procmsg_set_flags		(GSList		*mlist,
 					 FolderItem	*item);
+void	procmsg_mark_all_read		(FolderItem	*item);
 GSList *procmsg_sort_msg_list		(GSList		*mlist,
 					 FolderSortKey	 sort_key,
 					 FolderSortType	 sort_type);
diff --git a/po/bg.po b/po/bg.po
index 9e9ccf45..3a8d60a6 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -510,16 +510,16 @@ msgstr "��舒仗从舒"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr ""
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 仂��于仂��亳 ��舒亶仍���� �� 仄舒��从亳��仂于从亳��亠\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "仆亠 仄仂亢亠 亟舒 ��亠 于亰亠仄亠 ����仂弍��亠仆亳亠��仂 %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��亠于舒仍亳亟亠仆 从仂仄舒仆亟亠仆 ��亠亟 亰舒 仗亠��舒��: `%s'\n"
@@ -941,10 +941,10 @@ msgid "/New _Folder"
 msgstr "/��仂于舒 _��舒仗从舒"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1023,7 +1023,7 @@ msgstr ""
 "��从仂 亳亰����亳于舒��亠 ��舒仄仂 仗舒仗从舒��舒, 舒亟��亠��亳��亠 ��亠 弍��亟舒�� 仗��亠仄亠����亠仆亳 于 ��仂亟亳��亠仍��从舒��舒 "
 "仗舒仗从舒."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "��亰����亳于舒仆亠 仆舒 仗舒仗从舒"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "������仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "��舒仗从舒"
@@ -1245,8 +1245,8 @@ msgstr "/_��仂弍舒于�礌亠"
 msgid "/_Remove"
 msgstr "/_����亠仄舒��于舒仆亠"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_��从��亠��仂舒��亳..."
 
@@ -2040,12 +2040,12 @@ msgstr "��亠亟舒从��亳��舒仆亠 仆舒 仗舒仗从舒"
 msgid "Input the new name of folder:"
 msgstr "����于亠亟亠��亠 仆仂于仂��仂 亳仄亠 仆舒 仗舒仗从舒:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��仂于舒 仗舒仗从舒"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "����于亠亟亠��亠 亳仄亠 仆舒 仆仂于舒 仗舒仗从舒:"
 
@@ -2213,178 +2213,183 @@ msgstr "��亳��亠从��仂��亳�� 仆舒 ��仗��仍舒"
 msgid "Select folder"
 msgstr "��亰弍仂�� 仆舒 仗舒仗从舒"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "����仂亟����亳"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "��亰仗��舒��亠仆亳"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "��仗舒��从舒"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "��仂����亠"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "丼亠��仆仂于亳"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "��仂于舒��舒仗从舒"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' 仆亠 仄仂亢亠 亟舒 弍��亟亠 于从仍�ﾑ�亠仆仂 于 亳仄亠 仆舒 仗舒仗从舒"
 
-#: src/foldersel.c:564 src/folderview.c:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "��舒仗从舒��舒 `%s' 于亠��亠 ������亠����于��于舒"
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "��舒仗从舒��舒 `%s' 仆亠 仄仂亢亠 亟舒 弍��亟亠 ����亰亟舒亟亠仆舒."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/弌��亰亟舒于舒仆亠 仆舒 _仆仂于舒 仗舒仗从舒..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_����亠亳仄亠仆��于舒仆亠 仆舒 仗舒仗从舒..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_����亠亳仄亠仆��于舒仆亠 仆舒 仗舒仗从舒..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_��亰����亳于舒仆亠 仆舒 仗舒仗从舒"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "��亰��亳����于舒仆亠 仆舒 从仂����亠��仂"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_����仂于亠��从舒 亰舒 仆仂于亳 ����仂弍��亠仆亳��"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/_����亰仂弍仆仂于�磦舒仆亠 亟����于仂��仂 仆舒 仗舒仗从舒��舒"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_��亰亞仍亠亟/_��弍仆仂于�磦舒仆亠 仆舒 亳亰于舒亟从舒��舒"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/_��舒��从亳��舒仆亠/��舒��从亳��舒仆亠 从舒��仂 _仗��仂��亠��亠仆仂"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_丐������亠仆亠 仆舒 ����仂弍��亠仆亳��..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "���礆舒 仆亠仗��仂��亠��亠仆亳 ����仂弍��亠仆亳��."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_��舒仗亳��于舒仆亠 于 仆仂于亳仆舒����从舒 亞����仗舒"
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_����亠仄舒��于舒仆亠 仆舒 仆仂于亳仆舒����从舒 亞����仗舒"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "弌��亰亟舒于舒仆亠 仆舒 亳亰亞仍亠亟 仆舒 仗舒仗从舒...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "��仂于亳"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "��亠仗��仂��亠��亠仆亳"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "丕����舒仆仂于�磦舒仆亠 亳仆��仂��仄舒��亳�� 亰舒 仗舒仗从舒...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "丕����舒仆仂于�磦舒仆亠 亳仆��仂��仄舒��亳�� 亰舒 仗舒仗从舒..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "弌从舒仆亳��舒仆亠 仆舒 仗舒仗从舒 %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "����亰仂弍仆仂于�磦舒仆亠 亟����于仂��仂 仆舒 仗舒仗从舒��舒"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "������于仂��仂 仆舒 仗舒仗从舒��舒 ��亠 弍��亟亠 于��亰仂弍仆仂于亠仆仂. ����仂亟��仍亢舒仆亠?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "����亰仂弍仆仂于�磦舒仆亠 亟����于仂��仂 仆舒 仗舒仗从舒��舒..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "����亰仂弍仆仂于�磦舒仆亠 仆舒 亟����于仂��仂 仆舒 仗舒仗从舒��舒 仗��仂于舒仍亠仆仂."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "����仂于亠���磦舒仆亠 亰舒 仆仂于亳 ����仂弍��亠仆亳�� 于��于 于��亳��从亳 仗舒仗从亳..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "��舒仗从舒 %s 亠 亳亰弍��舒仆舒\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��亰仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "����亰仆亳从仆舒 亞��亠��从舒 仗��亳 仗��舒��舒仆亠 仆舒 ����仂弍��亠仆亳亠��仂 亟仂 %s."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2394,26 +2399,26 @@ msgstr ""
 "(舒从仂 亢亠仍舒亠��亠 亟舒 ����亰亟舒亟亠��亠 仗舒仗从舒 亰舒 ��������舒仆�磦舒仆亠 仆舒 仗仂亟仗舒仗从亳,\n"
 " 亟仂弍舒于亠��亠 `/' 仆舒 从��舒�� 仆舒 亳仄亠��仂)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "����于亠亟亠��亠 仆仂于仂 亳仄亠 亰舒 `%s'"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "����亠亳仄亠仆��于舒仆亠 仆舒 仗舒仗从舒"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "��舒仗从舒 `%s' 仆亠 仄仂亢亠 亟舒 ��亠 仗��亠仄舒��仆亠."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "��舒仗从舒 `%s' 仆亠 仄仂亢亠 亟舒 ��亠 仗��亠仄舒��仆亠."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2422,12 +2427,12 @@ msgstr ""
 "��亠仍舒亠��亠 仍亳 仗��亠仄舒��于舒仆亠 仆舒 仗仂��亠仆��从舒��舒 从����亳�� `%s'?\n"
 "(弌��仂弍��亠仆亳����舒 ���� ��亠 亳亰����亳于舒�� 仂�� 亟亳��从舒)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "��亰����亳于舒仆亠 仆舒 仗舒仗从舒"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2438,21 +2443,21 @@ msgstr ""
 "����亳��从亳 仗舒仗从亳 亳 ����仂弍��亠仆亳�� 仗仂亟 `%s' ��亠 弍��亟舒�� 亳亰����亳��亳.\n"
 "��舒亳����亳仆舒 仍亳 亢亠仍舒亠��亠 亳亰����亳于舒仆亠?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "��舒仗从舒 `%s' 仆亠 仄仂亢亠 亟舒 ��亠 仗��亠仄舒��仆亠."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "��亰��亳����于舒仆亠 仆舒 从仂����亠��仂"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰��亳����于舒仆亠 仆舒 从仂����亠��仂?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2461,34 +2466,34 @@ msgstr ""
 "��亠仍舒亠��亠 仍亳 仗��亠仄舒��于舒仆亠 仆舒 仗仂��亠仆��从舒��舒 从����亳�� `%s'?\n"
 "(弌��仂弍��亠仆亳����舒 ���� ��亠 亳亰����亳于舒�� 仂�� 亟亳��从舒)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "����亠仄舒��于舒仆亠 仆舒 仗仂��亠仆��从舒 从����亳��"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰����亳于舒仆亠 仆舒 IMAP4 舒从舒��仆�� `%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "��亰����亳于舒仆亠 仆舒 IMAP4 舒从舒��仆��"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰����亳于舒仆亠 仆舒 仆仂于亳仆舒����从舒 亞����仗舒 `%s'?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "��亰����亳于舒仆亠 仆舒 仆仂于亳仆舒����从舒 亞����仗舒"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "��亠仍舒亠��亠 仍亳 亳亰����亳于舒仆亠 仆舒 仆仂于亳仆舒����从亳 舒从舒��仆�� `%s'?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "��亰����亳于舒仆亠 仆舒 仆仂于亳仆舒����从亳 舒从舒��仆��"
 
diff --git a/po/cs.po b/po/cs.po
index e3bc1efe..42f5f5ac 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -513,16 +513,16 @@ msgstr "Slo転ka"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Ne炭sp��邸n叩 konverze k坦du.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "nelze otev��鱈t ozna��en箪 soubor\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nelze na��鱈st zpr叩vu %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Neplatn箪 p��鱈kazov箪 ��叩dek tisku: '%s'\n"
@@ -944,10 +944,10 @@ msgid "/New _Folder"
 msgstr "/Nov叩 s_lo転ka"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1025,7 +1025,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Smazat slo転ku "
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Slo転ka"
@@ -1246,8 +1246,8 @@ msgstr "/_P��idat..."
 msgid "/_Remove"
 msgstr "/_Odstranit"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -2042,12 +2042,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nov叩 slo転ka"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Zadejte n叩zev slo転ky:"
 
@@ -2215,179 +2215,184 @@ msgstr "Spool adres叩��"
 msgid "Select folder"
 msgstr "Vybrat slo転ku"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Doru��en叩 po邸ta"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odeslan叩 po邸ta"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Ko邸"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "Nov叩 slo転ka"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvo��it slo転ku '%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/_Vytvo��it novou slo転ku..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/P��ej_menovat slo転ku..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P��ej_menovat slo転ku..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Smazat slo転ku"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vypr叩zdnit ko邸"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Zkontrolovat nov辿 zpr叩vy"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovit strom slo転ek"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/Z_obrazit/_Aktualizace souhrnu"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/_Ozna��it/Ozna��it jako p��_e��ten辿"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/Na_j鱈t zpr叩vy..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "貼叩dn辿 nep��e��ten辿 zpr叩vy."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/P��i_hl叩sit diskusn鱈 skupinu..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Smazat d_iskusn鱈 skupinu"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Vytv叩��鱈m n叩hled pro slo転ku...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nov叩"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Nep��e��ten辿"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Nastavuji informace o slo転ce...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Nastavuji informace o slo転ce..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Prohled叩v叩m slo転ku %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Prohled叩v叩m slo転ku %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Obnovit strom slo転ek"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Prov叩d鱈m obnovu stromu slo転ek..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Prov叩d鱈m obnovu stromu slo転ek..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Zji邸泥uji nov辿 zpr叩vy ve v邸ech slo転k叩ch..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybr叩na slo転ka %s\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pos鱈l叩m zpr叩vu"
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, 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:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2397,26 +2402,26 @@ msgstr ""
 "(Pokud chcete vytvo��it slo転ku, kter叩 bude m鱈t dal邸鱈\n"
 "podslo転ky, p��idejte nakonec n叩zvu '/')"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nov辿 jm辿no pro '%s' :"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "P��ejmenovat slo転ku"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nemohu odstranit slo転ku '%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nemohu odstranit slo転ku '%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2425,12 +2430,12 @@ msgstr ""
 "Opravdu odebrat po邸tovn鱈 schr叩nku '%s'?\n"
 "(Zpr叩vy NEBUDOU smaz叩ny z disku)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Smazat slo転ku "
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2441,21 +2446,21 @@ msgstr ""
 "V邸echny slo転ky a zpr叩vy v '%s' budou vymaz叩ny.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit slo転ku '%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Vypr叩zdnit ko邸"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Vypr叩zdnit v邸echny zpr叩vy v ko邸i?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2464,34 +2469,34 @@ msgstr ""
 "Opravdu odebrat po邸tovn鱈 schr叩nku '%s'?\n"
 "(Zpr叩vy NEBUDOU smaz叩ny z disku)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Odstranit po邸tovn鱈 schr叩nku"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 炭��et '%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 炭��et"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusn鱈 skupinu '%s' ?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Smazat diskusn鱈 skupinu"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat 炭��et pro diskusn鱈 skupinu '%s'?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Smazat 炭��et pro diskuzn鱈 skupinu"
 
diff --git a/po/da.po b/po/da.po
index 8ada5028..2a31acdc 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -514,16 +514,16 @@ msgstr "Mappe"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Tegns脱t konverteringsfejl.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "kan ikke 奪bne mark辿ret fil\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan ikke hente meddelelse %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Udskrift kommando er ugyldig: `%s'\n"
@@ -945,10 +945,10 @@ msgid "/New _Folder"
 msgstr "/Ny _mappe"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1026,7 +1026,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappe"
@@ -1243,8 +1243,8 @@ msgstr "/_Tilf淡j..."
 msgid "/_Remove"
 msgstr "/_Fjern"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Egenskaber..."
 
@@ -2038,12 +2038,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2211,179 +2211,184 @@ msgstr "Spool sti"
 msgid "Select folder"
 msgstr "V脱lg mappe"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "K淡"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/_Opret ny mappe..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Omd淡b mappe..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Omd淡b mappe..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Slet mappe"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "T淡m Slettet"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "_Hent nye meddelelser"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/G_endan mappe tr脱"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vis/_Opdat辿r oversigt"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/_Mark辿r/_L脱st"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_S淡g meddelelse..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ingen ul脱ste meddelelser."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Abonner p奪 nyhedsgruppe..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_Slet nyhedsgruppe"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Opretter mappe tr脱...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Ny"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Ul脱st"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Indtast mappe information...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Indtast mappe information..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Gennems淡ger mappe %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Gennems淡ger mappe %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Genopbyg mappe tr脱"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Gendanner mappe tr脱..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Gendanner mappe tr脱..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Henter nye meddelelser i alle mapper..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2393,26 +2398,26 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "s奪 afslut navn med `/')"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Omd淡b mappe"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2421,12 +2426,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2437,21 +2442,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "T淡m Slettet"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2460,34 +2465,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
diff --git a/po/de.po b/po/de.po
index 446fae5c..aae60e6b 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -514,16 +514,16 @@ msgstr "Spam-Mail Filter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Zeichensatzumsetzung fehlgeschlagen.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "kann markierte Datei nicht 旦ffnen\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kann Nachricht %d nicht holen\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Druck-Befehlszeile ist ung端ltig: `%s'\n"
@@ -946,10 +946,10 @@ msgid "/New _Folder"
 msgstr "/Neue Ab_lage"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1028,7 +1028,7 @@ msgstr ""
 "Wenn Sie nur die Ablage l旦schen, werden die Adressen in das 端bergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Ablage l旦schen"
 
@@ -1161,7 +1161,7 @@ msgid "Group"
 msgstr "Gruppe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Ablage"
@@ -1249,8 +1249,8 @@ msgstr "/_Hinzuf端gen..."
 msgid "/_Remove"
 msgstr "/_Entfernen"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Eigenschaften..."
 
@@ -2000,12 +2000,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2172,174 +2172,179 @@ msgstr "W辰hle Verzeichnis"
 msgid "Select folder"
 msgstr "W辰hle Ablage"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Entw端rfe"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/_Neue Ablage erstellen..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/Ablage _umbenennen..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/Ablage _verschieben..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/Ablage _l旦schen"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/Leere _Papierkorb"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/Auf neue Nachrichten pr端fen"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/A_blagebaum erneuern"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/_Update Zusammenfassung"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Als gelesen markieren"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_Suche Nachrichten..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Suchbedingungen _bearbeiten..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/Herunterladen"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Newsgroup _abonnieren..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Newsgroup _entfernen"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Erstelle Ablageansicht...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Neu"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Ungelesen"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Setze Ablageinformation...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Setze Ablageinformation..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Durchsuche Ablage %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Durchsuche Ablage %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Ablagebaum erneuern"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Der Ablagebaum wird erneuert. Weiter?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Ablagenbaum erneuern..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ablagenbaum erneuern fehlgeschlagen..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Alle Ablagen auf neue Nachrichten pr端fen..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gew辰hlt\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2349,26 +2354,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:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name f端r '%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kann Ablage '%s' nicht umbenennen."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2377,11 +2382,11 @@ msgstr ""
 "Suchablage '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gel旦scht)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "Suchablage l旦schen"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2394,20 +2399,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "L旦sche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2416,34 +2421,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gel旦scht)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich l旦schen?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account l旦schen"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich l旦schen?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Newsgroup l旦schen"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich l旦schen?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "News-Account l旦schen"
 
diff --git a/po/el.po b/po/el.po
index e0043593..ba26ff93 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -519,16 +519,16 @@ msgstr "��留��略了凌粒凌��"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "�� 亮竜��留����凌��流 ��凌�� 虜�ﾎ肝肯採� 留��劉������竜.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "隆竜僚 亮��凌���� 僚留 留僚凌溜両�� ��凌 留����竜溜凌 mark\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "隆竜僚 亮��凌���� 僚留 了略硫�� ��凌 亮流僚��亮留 %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "�� 竜僚��凌了流 竜虜����������侶�� 竜溜僚留旅 略虜����侶: `%s'\n"
@@ -954,10 +954,10 @@ msgid "/New _Folder"
 msgstr "/��劉凌�� 虜留��略了凌粒凌��"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1036,7 +1036,7 @@ msgstr ""
 "��僚 隆旅留粒��略��竜��竜 ��凌僚 虜留��略了凌粒凌 亮��僚凌, 凌旅 隆旅竜��慮��僚��竜旅�� 慮留 亮竜��留虜旅僚侶慮凌��僚 ����凌僚 留���� "
 "��略僚�� 虜留��略了凌粒凌"
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "��旅留粒��留��流 虜留��留了��粒凌��"
 
@@ -1163,7 +1163,7 @@ msgid "Group"
 msgstr "��劉留��亮略隆留"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "��留��略了凌粒凌��"
@@ -1253,8 +1253,8 @@ msgstr "/����凌��慮流虜侶..."
 msgid "/_Remove"
 msgstr "/��旅留粒��留��流"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/��隆旅����侶��竜��..."
@@ -2069,12 +2069,12 @@ msgstr "����竜両竜��粒留��溜留 虜留��留了��粒凌��"
 msgid "Input the new name of folder:"
 msgstr "��旅��略粒竜��竜 ��凌 僚劉凌 ��僚凌亮留 ��凌�� 虜留��留了��粒凌��:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��劉凌�� 虜留��略了凌粒凌��"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "��旅��略粒竜��竜 ��凌 ��僚凌亮留 ��凌�� 僚劉凌�� 虜留��留了��粒凌��:"
 
@@ -2247,188 +2247,193 @@ msgstr "����旅了凌粒流 虜留��留了��粒凌��"
 msgid "Select folder"
 msgstr "����旅了凌粒流 虜留��留了��粒凌��"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "��旅��竜������亮竜僚留"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "����凌����凌了流"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "������略"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "��旅留粒��留亮亮劉僚留"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "��������竜旅��留"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "��凌 `%c' 隆竜僚 亮��凌��竜溜 僚留 ����亮��竜��旅了留亮硫略僚竜��留旅 ��竜 ��僚凌亮留 虜留��留了��粒凌��."
 
-#: src/foldersel.c:564 src/folderview.c:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "�� 虜留��略了凌粒凌�� `%s' ����略����竜旅 流隆侶."
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "隆竜僚 亮��凌���� 僚留 隆侶亮旅凌����粒流���� ��凌僚 虜留��略了凌粒凌 `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/��侶亮旅凌����粒溜留 僚劉凌�� 虜留��留了��粒凌��..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/��竜��凌僚凌亮留��溜留 虜留��留了��粒凌��..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/��竜��凌僚凌亮留��溜留 虜留��留了��粒凌��..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/��旅留粒��留��流 虜留��留了��粒凌��"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "��隆竜旅留��亮留 隆旅留粒��留亮亮劉僚��僚"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "裡��僚慮竜��侶 僚劉凌�� 亮侶僚��亮留��凌��"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/��僚侶亮劉������侶 隆凌亮流�� 虜留��留了��粒��僚"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/����竜旅虜��僚旅��侶/����隆旅虜凌����僚凌了凌"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/裡流亮留僚��侶/裡流亮留僚��侶 ���� 隆旅留硫留��亮劉僚凌"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 #, fuzzy
 msgid "/_Search messages..."
 msgstr "\t��僚留龍流��侶��侶 ����留 留����凌����劉了留����留 亮侶僚��亮留��留... "
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "��竜僚 ����略����凌��僚 留隆旅略硫留����留 亮侶僚��亮留��留"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 #, fuzzy
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/裡��僚隆��凌亮流 ��竜 newsgroup..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/��旅留粒��留��流 newsgroup"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "��侶亮旅凌����粒�� ��侶僚 留��竜旅虜��僚旅��侶 虜留��留了��粒��僚...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "��劉留"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "��隆旅略硫留����留"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "留��."
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "��劉���� ��旅�� ��了侶��凌��凌��溜竜�� 虜留��留了��粒��僚...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "��劉���� ��旅�� ��了侶��凌��凌��溜竜�� 虜留��留了��粒��僚..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "裡略������侶 虜留��留了��粒��僚 %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "裡略������侶 虜留��留了��粒凌�� %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/��僚侶亮劉������侶 隆凌亮流�� 虜留��留了��粒��僚"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "��僚侶亮劉������侶 ��侶�� 隆凌亮流�� 虜留��留了��粒��僚..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "��僚侶亮劉������侶 ��侶�� 隆凌亮流�� 虜留��留了��粒��僚..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "裡��僚慮竜��侶 僚劉凌�� 亮侶僚��亮留��凌��"
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "�� 虜留��略了凌粒凌�� %s 竜溜僚留旅 竜��旅了竜粒亮劉僚凌��\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "����凌����凌了流 亮侶僚��亮留��凌��"
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "裡��僚劉硫侶 ����略了亮留 虜留��略 ��侶僚 留��凌����凌了流 ��凌�� 亮侶僚��亮留��凌�� ��竜 %s ."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2438,26 +2443,26 @@ msgstr ""
 "(留僚 慮劉了竜��竜 僚留 隆侶亮旅凌����粒流��竜��竜 劉僚留 虜留��略了凌粒凌 粒旅留 僚留 硫略了竜��竜 ����凌虜留��留了��粒凌����\n"
 " ����凌��慮劉����竜 ��凌 `/' ����凌 ��劉了凌�� ��凌�� 凌僚��亮留��凌��)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "���ﾏ���竜 僚劉凌 ��僚凌亮留 粒旅留 `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "��竜��凌僚凌亮留��溜留 虜留��留了��粒凌��"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "��竜僚 亮��凌���� 僚留 隆旅留粒��略���� ��凌僚 虜留��略了凌粒凌 `%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "��竜僚 亮��凌���� 僚留 隆旅留粒��略���� ��凌僚 虜留��略了凌粒凌 `%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2466,12 +2471,12 @@ msgstr ""
 "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 ��凌 mailbox `%s' ;\n"
 "(里留 亮侶僚��亮留��留 ������ ��硫流僚凌僚��留旅 留���� ��凌僚 隆溜��虜凌)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "��旅留粒��留��流 虜留��留了��粒凌��"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2482,21 +2487,21 @@ msgstr ""
 "��了凌旅 凌旅 虜留��略了凌粒凌旅 虜留旅 ��留 亮侶僚��亮留��留 虜略���� 留���� ��凌 `%s' 慮留 隆旅留粒��留��凌��僚.\n"
 "��劉了竜��竜 ����略粒亮留��旅 僚留 隆旅留粒��留��凌��僚;"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "��竜僚 亮��凌���� 僚留 隆旅留粒��略���� ��凌僚 虜留��略了凌粒凌 `%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "��隆竜旅留��亮留 隆旅留粒��留亮亮劉僚��僚"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "��留 留隆竜旅略���� ��了留 ��留 隆旅留粒��留亮亮劉僚留 亮侶僚��亮留��留"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2505,35 +2510,35 @@ msgstr ""
 "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 ��凌 mailbox `%s' ;\n"
 "(里留 亮侶僚��亮留��留 ������ ��硫流僚凌僚��留旅 留���� ��凌僚 隆溜��虜凌)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/��旅留粒��留��流 mailbox"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 凌 IMAP4 了凌粒留��旅留��亮���� `%s';"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "��旅留粒��留��流 了凌粒留��旅留��亮凌�� IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 ��凌 newsgroup `%s';"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "��旅留粒��留��流 newsgroup"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "裡溜粒凌����留 僚留 隆旅留粒��留��竜溜 凌 了凌粒留��旅留��亮���� news `%s';"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "��旅留粒��留��流 了凌粒留��旅留��亮凌�� news"
 
diff --git a/po/es.po b/po/es.po
index 75ec0025..b29ddfb7 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -513,16 +513,16 @@ msgstr "Filtro de correo basura"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversi坦n de c坦digos fallida.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "no se puede abrir el fichero de marcas\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "no se puede obtener el mensaje %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La orden para imprimir es inv叩lida: 束%s損\n"
@@ -943,10 +943,10 @@ msgid "/New _Folder"
 msgstr "/Nueva _carpeta"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1024,7 +1024,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
@@ -1245,8 +1245,8 @@ msgstr "/_A単adir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -1998,12 +1998,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2171,174 +2171,179 @@ msgstr "Seleccionar directorio"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta 束%s損."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Crear _nueva carpeta..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Renombrar carpeta..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/_Mover carpeta..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/_Vaciar papelera"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hay mensajes nuevos"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir 叩rbol de carpetas"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/_Actualizar resumen"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Marcar como le鱈do"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_Buscar en los mensajes"
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Ed_itar condici坦n de b炭squeda..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/Des_cargar"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nuevos"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "No le鱈dos"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "N尊"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Estableciendo informaci坦n de carpeta...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Estableciendo informaci坦n de carpeta..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Reconstruir 叩rbol de carpetas"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Se reconstruir叩 el 叩rbol de carpetas. 多Continuar?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruyendo el 叩rbol de carpetas..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstrucci坦n del 叩rbol de carpetas fall坦."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Basura"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en 束%s損."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2348,26 +2353,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " a単ada `/' al final del nombre)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para 束%s損:"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede renombrar la carpeta 束%s損."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta 束%s損."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2376,11 +2381,11 @@ msgstr ""
 "多Eliminar la carpeta de b炭squeda 束%s損 ?\n"
 "(Los mensajes no se borrar叩n)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "Borrar carpeta de b炭squeda"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2393,20 +2398,20 @@ msgstr ""
 "\n"
 "多Est叩 seguro de que quiere borrarla?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede borrar la carpeta 束%s損."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "多Borrar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2415,34 +2420,34 @@ msgstr ""
 "多Realmente desea eliminar el buz坦n 束%s損 ?\n"
 "(Los mensajes NO se borrar叩n del disco)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "多Eliminar realmente la cuenta IMAP4 束%s損?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "多Borrar el grupo de noticias 束%s損?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "多Borrar la cuenta de noticias 束%s損?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
diff --git a/po/et.po b/po/et.po
index 6307da34..87ad9de5 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -517,16 +517,16 @@ msgstr "Kaust"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Koodi muundamine eba探nnestus.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "Ei suuda avada m辰rgifaili\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ei suuda v探tta kirja %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Tr端kkimise k辰surida on vale: %s\n"
@@ -947,10 +947,10 @@ msgid "/New _Folder"
 msgstr "/Uus Kaust"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1028,7 +1028,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -1162,7 +1162,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Kaust"
@@ -1250,8 +1250,8 @@ msgstr "/Lis_a..."
 msgid "/_Remove"
 msgstr "/Eemalda"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/Omadus..."
@@ -2047,12 +2047,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2220,182 +2220,187 @@ msgstr "Kirja jada kataloog"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "J辰rjekord"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Pr端gikast"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Loo uus kaust..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/Nimeta kaust 端mbe_r..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/Nimeta kaust 端mbe_r..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/Kustuta kaust"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "T端hjenda pr端gikast"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Vaata uusi kirju"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/_Uuenda kausta puu"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Vaade/_Uuenda koond"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/M辰rk/M辰rgi loetuks"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_Otsi kirju..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Telli uudi_stegrupp..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Eemalda uudisteg_rupp"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Loon kausta vaate...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Uus"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Pole loetud"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Sean kausta info...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Sean kausta info..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Tuhnin kaustas %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Tuhnin kaustas %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "Uuenda kausta puu"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uuendan kasuta puu..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "K探igis kaustades otsitakse uusi kirju..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2405,26 +2410,26 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime l探ppu)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Nimeta kaust 端mber"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2433,12 +2438,12 @@ msgstr ""
 "Kas t探epoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2449,21 +2454,21 @@ msgstr ""
 "Kustutatakse k探ik kaustad ja kirjad %s-s.\n"
 "Kas sa t探esti soovid kustutada?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "T端hjenda pr端gikast"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada k探ik kirjad pr端gikastist?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2472,34 +2477,34 @@ msgstr ""
 "Kas t探epoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas t探esti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas t探esti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas t探esti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
diff --git a/po/fr.po b/po/fr.po
index ba83e97c..5fc2dd5d 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -524,16 +524,16 @@ msgstr "Dossier des messages ind辿sirables"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): la conversion de code a 辿chou辿.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "Impossible d'ouvrir le fichier des marques\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossible de r辿cup辿rer le message %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La ligne de commande d'impression est invalide : 束 %s 損\n"
@@ -956,10 +956,10 @@ msgid "/New _Folder"
 msgstr "/Nouveau _dossier"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1038,7 +1038,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1172,7 +1172,7 @@ msgid "Group"
 msgstr "Groupe"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dossier"
@@ -1260,8 +1260,8 @@ msgstr "/_Ajouter..."
 msgid "/_Remove"
 msgstr "/_Enlever"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Propri辿t辿s..."
 
@@ -2016,12 +2016,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2189,175 +2189,180 @@ msgstr "S辿lectionnez un dossier"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "R辿ception"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Envoy辿"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de cr辿er le dossier 束 %s 損."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Cr辿er un _nouveau dossier..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Renommer le dossier..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/_D辿placer le dossier..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Supprimer le dossier"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/_Vider la corbeille"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/Re_chercher les nouveaux messages"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/Reconstruire l'_arborescence"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/Mettre �� jo_ur le r辿sum辿 des messages"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Marquer comme lu"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/Rechercher dans le _dossier..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Mod_ifier le motif de recherche..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/T辿_l辿charger"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Inscription aux groupes de discussion..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_Supprimer le groupe de discussion"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Cr辿ation de la vue des dossiers...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nouveau"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Non lu"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Enregistrement des donn辿es des dossiers...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Initialisation des donn辿es des dossiers..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analyse du dossier %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analyse du dossier %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Reconstruire l'_arborescence"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'arborescence va 棚tre reconstruite. Poursuivre ?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruction de l'arborescence..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "La reconstruction de l'arborescence a 辿chou辿."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Recherche des nouveaux messages..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Ind辿sirable"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s s辿lectionn辿\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "T辿l辿chargement des messages dans %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, 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:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2367,26 +2372,26 @@ msgstr ""
 "(si vous voulez cr辿er un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' �� la fin du nom)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour 束 %s 損 :"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de renommer le dossier 束 %s 損."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de d辿placer le dossier 束 %s 損."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2395,11 +2400,11 @@ msgstr ""
 "Effacer le dossier de tri 束 %s 損 ?\n"
 "Les messages existants ne seront PAS effac辿s du disque."
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "Effacer le dossier de tri"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2412,20 +2417,20 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible d'effacer le dossier 束 %s 損."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "Effacer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2434,34 +2439,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:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Suppression d'une bo樽te aux lettres"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 束 %s 損 ?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion 束 %s 損 ?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte 束 %s 損 des groupes de discussion ?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
diff --git a/po/gl.po b/po/gl.po
index c56c52c6..42b3338d 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -514,16 +514,16 @@ msgstr "Carpeta"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversi坦n de c坦digos fallida.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "no se pode abrir o ficheiro de marcas\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "non se pode obter o mensaxe %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "o comando de impresi坦n non 辿 v叩lido: `%s'\n"
@@ -945,10 +945,10 @@ msgid "/New _Folder"
 msgstr "/Nova _carpeta"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1026,7 +1026,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1161,7 +1161,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Carpeta"
@@ -1249,8 +1249,8 @@ msgstr "/_Engadir"
 msgid "/_Remove"
 msgstr "/_Quitar"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Propiedades..."
 
@@ -2045,12 +2045,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2219,179 +2219,184 @@ msgstr "Directorio de almac辿n"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Crear _nova carpeta..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Renomear carpeta..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Borrar carpeta"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Comprobar si hai mensaxes novas"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruir 叩rbre de carpetas"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Ver/Actualizar res_umen"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/_Marcar/Marcar como _le鱈do"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_Buscar nas mensaxes"
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "Non hai mensaxes sin leer."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Suscribirse a un grupo..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Creando vista de carpeta...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Novos"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Non le鱈dos"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "N尊"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Establecendo informaci坦n de carpeta...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Establecendo informaci坦n de carpeta..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando carpeta %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando carpeta %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Reconstruir arbre de carpetas"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruindo a arbre de carpetas..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2401,26 +2406,26 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2429,12 +2434,12 @@ msgstr ""
 "多Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrar叩n do disco)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2445,21 +2450,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' ser叩n borrados.\n"
 "多Confirma o borrado?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "多Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2468,34 +2473,34 @@ msgstr ""
 "多Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrar叩n do disco)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "多Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "多Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "多Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
diff --git a/po/hr.po b/po/hr.po
index 407a26ff..9d4bad77 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -520,16 +520,16 @@ msgstr "Spis"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promjena koda nije uspjela.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obilje転enu datoteku\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za ispis nije dobra: `%s'\n"
@@ -950,10 +950,10 @@ msgid "/New _Folder"
 msgstr "/Novi _spis"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1031,7 +1031,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Obri邸i spis"
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Spis"
@@ -1247,8 +1247,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Ukloni"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Postavke..."
@@ -2056,12 +2056,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2229,186 +2229,191 @@ msgstr "Spool direktorij"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sandu��i��"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "Po邸alji"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odlo転eno"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Sme��e"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovr邸eno"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi spis..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Preimenuj spis..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Obri邸i spis"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni sme��e"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 #, fuzzy
 msgid "/_Check for new messages"
 msgstr "Kreiranje nove po邸te"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 #, fuzzy
 msgid "/R_ebuild folder tree"
 msgstr "/O_svje転i stablo spisa"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Znakovni standard"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/_Ozna��i/Ozna��i kao _pro��itano"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_Tra転i poruka..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepro��itanih poruka."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Pribilje転i se na _news grupu..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Ukloni news _grupu"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Stvaram spisni pregled...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Nepro��itano"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Postavljam info spisa...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Postavljam info spisa..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretra転ujem spise %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretra転ujem spis %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 #, fuzzy
 msgid "Rebuild folder tree"
 msgstr "/O_svje転i stablo spisa"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 #, fuzzy
 msgid "Rebuilding folder tree..."
 msgstr "Osvje転avam stablo spisa..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osvje転avam stablo spisa..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 #, fuzzy
 msgid "Checking for new messages in all folders..."
 msgstr "Kreiranje nove po邸te"
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��aljem poruku"
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, 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:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2418,26 +2423,26 @@ msgstr ""
 "(ukoliko 転elite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2446,12 +2451,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NE��E biti obrisane s diska)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obri邸i spis"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2462,21 +2467,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti ��e obrisane.\n"
 "貼elite li ih uistinu obrisati?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Isprazni sme��e"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u sme��u?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2485,35 +2490,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NE��E biti obrisane s diska)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandu��i��"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 ra��un?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Obri邸i IMAP4 ra��un"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Obri邸i news grupu"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news ra��un?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Obri邸i news ra��un"
 
diff --git a/po/hu.po b/po/hu.po
index 097d1d5c..d5a67f7b 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -514,16 +514,16 @@ msgstr "Lev辿lszem辿t sz撤r��"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): K坦d konverzi坦s hiba.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "A kijel旦lt f叩jl nem nyithat坦 meg\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d 端zenet v辿tele nem siker端lt\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��rv辿nytelen nyomtat坦 parancs: `%s'\n"
@@ -948,10 +948,10 @@ msgid "/New _Folder"
 msgstr "/��_j Mappa"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1029,7 +1029,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Mappa t旦rl辿se"
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Csoport"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mappa"
@@ -1246,8 +1246,8 @@ msgstr "/_Hozz叩ad叩s..."
 msgid "/_Remove"
 msgstr "/_Elt叩vol鱈t叩s"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Tulajdons叩gok..."
 
@@ -1998,12 +1998,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��j mappa"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Az 炭j mappa neve:"
 
@@ -2170,174 +2170,179 @@ msgstr "K旦nyvt叩r v叩laszt叩sa"
 msgid "Select folder"
 msgstr "Mappa v叩laszt叩sa"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Bej旦v��"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Kimen��"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "V叩rakoz坦"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "V叩zlatok"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "��j mappa"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozhat坦 l辿tre."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/��j _mappa l辿trehoz叩sa..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/Mappa 叩t_nevez辿se..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/Mappa 叩t_helyez辿se..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/Mappa _t旦rl辿se"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/_Kuka 端r鱈t辿se"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/��_j 端zenetek ellen��rz辿se"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/_Mappafa 炭jra辿p鱈t辿se"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/��_sszegz辿s friss鱈t辿se"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Olvasottk辿nt megjel旦l"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/��_zenetek keres辿se..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Keres辿si felt辿telek _m坦dos鱈t叩sa..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/Le_t旦lt辿s"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/H鱈rcsoport _el��fizet辿se..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/H鱈rcsoport e_lt叩vol鱈t叩sa"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Mappa n辿zet l辿trehoz叩sa...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "��j"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Olvasatlan"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Mappa inform叩ci坦 be叩ll鱈t叩sa...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Mappa inform叩ci坦 be叩ll鱈t叩sa..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s mappa 叩tvizsg叩l叩sa..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s mappa 叩tvizsg叩l叩sa..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Mappafa 炭jra辿p鱈t辿se"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A mappafa 炭jra fog 辿p端lni. Folytatja?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Mappafa 炭jra辿p鱈t辿se..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Mappafa 炭jra辿p鱈t辿se sikertelen."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "��j 端zenetek keres辿se minden mapp叩ban..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Lev辿lszem辿t"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiv叩lasztva\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��zenetek let旦lt辿se %s mapp叩ba ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, 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:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2347,26 +2352,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:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' 炭j nev辿t:"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Mappa 叩tnevez辿se"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' mappa nem nevezhet�� 叩t."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhet�� 叩t."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2375,11 +2380,11 @@ msgstr ""
 "A(z) `%s' keres辿si mappa t旦rl辿se?\n"
 "Az eredeti 端zenetek nem t旦rl��dnek."
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "Keres辿si mappa t旦rl辿se"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2392,20 +2397,20 @@ msgstr ""
 "\n"
 "Biztosan t旦r旦lni szeretn辿?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' mappa nem t叩vol鱈that坦 el."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Kuka 端r鱈t辿se"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden 端zenet t旦rl辿se a kuk叩b坦l?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2414,34 +2419,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:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Postal叩da elt叩vol鱈t叩sa"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "T辿nyleg t旦rli a(z) `%s' IMAP4 hozz叩f辿r辿st?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozz叩f辿r辿s t旦rl辿se"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "T辿nyleg t旦rli a(z) `%s' h鱈rcsoportot?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "H鱈rcsoport t旦rl辿se"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "T辿nyleg t旦rli a(z) `%s' h鱈rhozz叩f辿r辿st?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "H鱈rhozz叩f辿r辿s t旦rl辿se"
 
diff --git a/po/it.po b/po/it.po
index 491c3e99..a5fa7eea 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -514,16 +514,16 @@ msgstr "Filtro mail spazzatura"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Conversione del codice fallita.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "Impossibile aprire il file delle segnature\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "impossibile prelevare il messaggio %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "La riga di comando di stampa non 竪 valida: 束%s損\n"
@@ -946,10 +946,10 @@ msgid "/New _Folder"
 msgstr "/Nuova _cartella"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1028,7 +1028,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -1161,7 +1161,7 @@ msgid "Group"
 msgstr "Gruppo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Cartella"
@@ -1249,8 +1249,8 @@ msgstr "/_Aggiungi..."
 msgid "/_Remove"
 msgstr "/_Rimuovi"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Propriet��..."
 
@@ -2005,12 +2005,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2178,174 +2178,179 @@ msgstr "Selezione directory"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella 束%s損."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Crea _nuova cartella..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Rinomina cartella..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/_Sposta cartella..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Elimina cartella"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/Svuo_ta cestino"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Controllo nuovi messaggi"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/R_icostruisci l'albero cartella"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/A_ggiorna sommario"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Segna come letto"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/Ricerca _messaggi..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Mod_ifica condizioni di ricerca..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/Sc_arica"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Iscrizione newsgroup..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_Rimuovi newsgroup..."
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Creazione della vista della cartella...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nuovi"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Non letti"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "Tot."
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Impostazione delle informazioni della cartella...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Impostazione delle informazioni della cartella..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Analisi della cartella %s%c%s..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Analisi della cartella %s..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Ricostruisco l'albero della cartella"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "L'albero della cartella sar�� ricostruito. Continuo?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Sto ricostruendo l'albero della cartella..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "La ricostruzione delll'albero della cartella 竪 fallita."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s 竪 selezionata\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si 竪 verificato un errore scaricando i messaggi in 束%s損."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,26 +2360,26 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere 束/損 alla fine del nome)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per 束%s損:"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossibile rinominare la cartella 束%s損."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella 束%s損."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2383,11 +2388,11 @@ msgstr ""
 "Rimuovere la cartella di ricerca 束%s損 ?\n"
 "I messaggi reali non saranno eliminati."
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "Elimina la cartella di ricerca"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2401,20 +2406,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella 束%s損."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2423,34 +2428,34 @@ msgstr ""
 "Rimuovere la casella postale 束%s損 ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 束%s損?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup 束%s損 ?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news 束%s損 ?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
diff --git a/po/ja.po b/po/ja.po
index 317e70ca..a5cd3fdd 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -513,16 +513,16 @@ msgstr "菴傑����＜�若�������ｃ�����"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): ��潟�若��紊�������紊掩�������障��������\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "�����若�������＜�ゃ�������������障�����\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "��＜����祉�若�� %d ���������莨若����障�����\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��医�激����潟����潟�������ゃ�潟����≦�鴻�с��: `%s'\n"
@@ -943,10 +943,10 @@ msgid "/New _Folder"
 msgstr "/��域��������������(_F)"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1024,7 +1024,7 @@ msgstr ""
 "`%s' �����������鴻����������������������≪�������鴻�������ゃ����������������с�����?\n"
 "�����������������帥�������ゃ�������翫�������≪�������鴻��荀����������������腱糸�������障�����"
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "���������������������"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "��違����若��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "������������"
@@ -1243,8 +1243,8 @@ msgstr "/菴遵��(_A)..."
 msgid "/_Remove"
 msgstr "/������(_R)"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/���������������(_P)..."
 
@@ -1994,12 +1994,12 @@ msgstr "���������������膩����"
 msgid "Input the new name of folder:"
 msgstr "�����������������違����������������ュ��������������������:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��域��������������"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "��域����������������������������ュ��������������������:"
 
@@ -2166,174 +2166,178 @@ msgstr "�����ｃ����������������御��"
 msgid "Select folder"
 msgstr "�����������������御��"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "���篆∞��"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "���篆≧ｧ"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "���篆≦�����"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "�����睡��"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "���腮�"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "������������������ `%c' ��������������������с����障��������"
 
-#: src/foldersel.c:564 src/folderview.c:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "������������ `%s' ��������с��絖���������障�����"
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "������������ `%s' ���篏������с����障��������"
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/��域�����������������篏����(_N)..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/������������������紊����(_R)..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/���������������腱糸��(_M)..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/���������������������(_D)"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/�����睡�宴��腥冴��������(_T)"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/��亥����＜����祉�若�吾�������с�����(_C)"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/��������������������若�����罕�膀�(_E)"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/��泣����������贋��(_U)"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+msgid "/Mar_k all read"
+msgstr "/�����鴻��茯����������������������(_K)"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/��＜����祉�若�吾��罎�膣�(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/罎�膣∽�＞散���膩����(_I)..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/��������潟����若��(_L)"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/�����ャ�若�鴻�違����若�����莖取��(_B)..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/�����ャ�若�鴻�違����若�����������(_R)"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "�����������������ャ�若��篏����筝�...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "��亥��"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "���茯�"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "膩����"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "�����������������宴��荐�絎�筝�...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "�����������������宴��荐�絎�筝�..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "�����������������鴻����ｃ�割賢 (%s%c%s) ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "�����������������鴻����ｃ�割賢 (%s)..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "��������������������若�����罕�膀�"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "��������������������若�����罕�膀������障�����膓������障�����?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "��������������������若�����罕�膀�筝�..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "��������������������若�����罕�膀����紊掩�������障��������"
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "��������������������亥����＜����祉�若�吾�������с�����筝�..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "菴傑����＜�若��"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "������������ %s �����御����������障�����\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 筝������＜����祉�若�吾����������潟����若��筝�..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 筝������＜����祉�若�吾����������潟����若��筝������������若����榊�������障��������"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2343,26 +2347,26 @@ msgstr ""
 "(��泣�������������������主�����������������������篏���������������翫��������\n"
 " ������������緇���� `/' ���菴遵��������������������)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' �����違����������������ュ��������������������:"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "������������������紊����"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "������������ '%s' ������������紊���眼�с����障��������"
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "������������ `%s' ���腱糸����с����障��������"
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2371,11 +2375,11 @@ msgstr ""
 "罎�膣≪����������� '%s' ��������ゃ����障�����?\n"
 "絎���������＜����祉�若�吾�������ゃ�������障��������"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "罎�膣≪��������������������"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2388,20 +2392,20 @@ msgstr ""
 "\n"
 "���綵���������ゃ����������������с�����?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "������������ '%s' ��������ゃ�с����障��������"
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "�����睡�宴��腥冴��������"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "�����睡�宴��筝������＜����祉�若�吾�������鴻�������ゃ����障�����?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2410,34 +2414,34 @@ msgstr ""
 "���綵������＜�若�������������� `%s' ��������ゃ����障�����?\n"
 "(��＜����祉�若�吾�������ｃ�鴻����������������ゃ�������障�����)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "��＜�若�������������鴻��������"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "���綵����IMAP4��≪�������潟�� `%s' ��������ゃ����障�����?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "IMAP4��≪�������潟�����������"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "���綵���������ャ�若�鴻�違����若�� `%s' ��������ゃ����障�����?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "�����ャ�若�鴻�違����若�����������"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "���綵���������ャ�若�鴻�≪�������潟�� `%s' ��������ゃ����障�����?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "�����ャ�若�鴻�≪�������潟�����������"
 
diff --git a/po/ko.po b/po/ko.po
index 7aff1d6b..b9cd22fd 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -517,16 +517,16 @@ msgstr "�启��"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 貊���� 覲������� ��ろ�������給�����.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "������ �����殊�� ��伎��螳� �����給�����\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "覃����讌� %d襯� 螳���語�� ���螳� �����給�����\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��語�� 覈���轟�願�� ���覦�襯伎�������給�����: `%s'\n"
@@ -936,10 +936,10 @@ msgid "/New _Folder"
 msgstr "/��� �启��(_F)"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1017,7 +1017,7 @@ msgstr ""
 "`%s'��� 覈���� 譯殊����� �启��襯� ���������蟾���� ? \n"
 "�启��襷� 讌���� 蟆曙�� 譯殊����� 蠏� ������ �启��襦� ���蟆�讌�������."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "�启�� ������"
 
@@ -1145,7 +1145,7 @@ msgid "Group"
 msgstr "蠏碁９"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "�启��"
@@ -1233,8 +1233,8 @@ msgstr "/豢�螳�(_A)..."
 msgid "/_Remove"
 msgstr "/������(_R)"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/��轟��(_P)..."
@@ -2029,12 +2029,12 @@ msgstr "�启�� �ｸ讌�"
 msgid "Input the new name of folder:"
 msgstr "��� �启����� ��企����� ��ｌ�殊�語��:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��� �启��"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "��� �启����� ��企����� ��ｌ�殊�語��:"
 
@@ -2202,179 +2202,184 @@ msgstr "��ろ�� ���������襴�"
 msgid "Select folder"
 msgstr "�启�� ������"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "覦���� �ｸ讌����"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "覦���� �ｸ讌����"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "覲企�� �ｸ讌����"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "讌���� �ｸ讌����"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "������ 覲願�����"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "��� �启��"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'��� �启�� ��企����� ��������� ��� �����給�����."
 
-#: src/foldersel.c:564 src/folderview.c:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' �启��螳� ��企�� 譟伎�����������."
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' �启��襯� �����燕�� ���螳� �����給�����."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/��� �启�� 襷���り鍵(_n)..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/�启�� ��企�� 覦�蠑瑚鍵(_R)..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/�启�� ��企�� 覦�蠑瑚鍵(_R)..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/�启�� 讌���郁鍵(_D)"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "讌���� �ｸ讌���� 觜���郁鍵"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/��� 覃����讌� ������(_C)"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/�启�� ��碁Μ 螳煙��(_e)"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/覲願鍵(_V)/������ 螳煙��(_U)"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/������(_M)/��曙�� 蟆���朱�� ������(_d)"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/覃����讌� 谿剰鍵(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "��� ��曙�� 覃����讌�螳� �����給�����."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/��伎�り係襭� 蟲����(_b)..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/��伎�り係襭� ������(_R)"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "�启�� 觀磯ゼ �����燕��������...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "���蟆�"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "�����曙��"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "���豌�"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "�启�� ���覲企ゼ ��れ�����������...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "�启�� ���覲企ゼ ��れ�����������..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s襯� ��れ�����������..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s �启��襯� ��れ�����������..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "�启�� ��碁Μ 螳煙��"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "�启�� ��碁Μ襯� 螳煙�����������..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "�启�� ��碁Μ襯� 螳煙�����������..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "覈���� �启����� ���襦���� 覃����讌�襯� �����誤��������..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s �启��螳� ��������������給�����\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "覃����讌���� 覲企�企�� 譴�"
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s襦� 覃����讌�襯� 覲企�企�� 譴� ������螳� 覦���������給�����."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2384,26 +2389,26 @@ msgstr ""
 "(襷���� �������启��襯� �����ロ��蠍� ������ �启��襯� �����燕����る��,\n"
 "��企����� 襷�讌�襷���� `/'襯� 豢�螳������語��)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'��������� ��� ��企����� ��ｌ�殊�語��:"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "�启�� ��企�� 覲�蟆�"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' �启��襯� ���蟇壱�� ���螳� �����給�����."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' �启��襯� ���蟇壱�� ���螳� �����給�����."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2412,12 +2417,12 @@ msgstr ""
 "`%s' 覃���朱����るゼ ���襷�襦� ������������蟆���給��蟾�?\n"
 "(覃����讌�螳� �����ろ��襦�覿���� ������������蟆���� ������������)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "�启�� ������"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2428,21 +2433,21 @@ msgstr ""
 "`%s'��������� ������ 覈���� �启����� 覃����讌�螳� ��������� 蟆����������.\n"
 "���襷�襦� ������������蟆���給��蟾�?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' �启��襯� ���蟇壱�� ���螳� �����給�����."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "讌���� �ｸ讌���� 觜���郁鍵"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "讌���� �ｸ讌������������� 覈���� 覃����讌�襯� 觜���瑚�����?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2451,34 +2456,34 @@ msgstr ""
 "`%s' 覃���朱����るゼ ���襷�襦� ������������蟆���給��蟾�?\n"
 "(覃����讌�螳� �����ろ��襦�覿���� ������������蟆���� ������������)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "覃���朱����るゼ ���蟇壱��������"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "���襷�襦� `%s' IMAP4 螻������� ������������蟆���給��蟾�?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 螻���� ������"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "���襷�襦� `%s' ��伎�り係襭轟�� ������������蟆���給��蟾�?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "��伎�り係襭� ������"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "���襷�襦� `%s' ��伎�り係襭� 螻������� ������������蟆���給��蟾�?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "��伎�り係襭� 螻���� ������"
 
diff --git a/po/lt.po b/po/lt.po
index 046700d0..9fcc59dc 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -513,16 +513,16 @@ msgstr "Nereikalingo pa邸to filtras"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepavyko konvertuoti kodo.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "negali atidaryti 転ym迭 bylos\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "negaliu gauti lai邸ko %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Bloga spausdinimo komanda: ���%s���\n"
@@ -943,10 +943,10 @@ msgid "/New _Folder"
 msgstr "/Naujas _katalogas"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1024,7 +1024,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "I邸trinti katalog��"
 
@@ -1152,7 +1152,7 @@ msgid "Group"
 msgstr "Grup��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalogas"
@@ -1240,8 +1240,8 @@ msgstr "/Pri_d��ti..."
 msgid "/_Remove"
 msgstr "/_Pa邸alinti"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Savyb��s..."
 
@@ -1991,12 +1991,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "町veskite naujo katalogo pavadinim��:"
 
@@ -2163,174 +2163,179 @@ msgstr "Pasirinkti katalog��"
 msgid "Select folder"
 msgstr "Pasirinkti katalog��"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gauti"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "I邸si迭sti"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Eil��"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "��iuk邸lin��"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Juodra邸��iai"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NaujasKatalodas"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas ���%s��� egzistuoja."
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo ���%s���."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Sukurti _nauj�� katalog��..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/Pe_rvadinti katalog��..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/Per_kelti katalog��..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/I邸_trinti katalog��"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/I邸valy_ti 邸iuk邸lin��"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Patikrinti pa邸t��"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/P_erkurti katalog迭 med眺"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/Atna_ujinti santrauk��"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Pa転ym��ti skaityta"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/I_e邸koti lai邸k迭"
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Ke_isti paie邸kos kriterijus..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/_Atsisi迭sti"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Prisijungti prie naujien迭 grup��s"
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Pa邸a_linti naujien迭 grup��"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Sukuriama katalog迭 per転i笛ra...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nauji"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Neskaityti"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Nustatoma katalogo informacija...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Nustatoma katalogo informacija..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Skanuojamas katalogas ���%s%c%s���..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Skanuojamas katalogas ���%s���..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Perkurti katalog迭 med眺"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Bus perkurtas katalog迭 medis. T��sti?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Perkuriamas katalog迭 medis..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Katalog迭 med転io perk笛rimas nepavyko."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Tikrinami nauji lai邸kai visuose kataloguose..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pa転ym��tas katalogas ���%s���\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Gaunami lai邸kai (���%s���)..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida gaunant lai邸kus (���%s���)."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2340,26 +2345,26 @@ msgstr ""
 "(jei norite sukurti katalog�� talpinti pakatalogiams,\n"
 " prid��kite ���/��� prie vardo pabaigos)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "町veskite nauj�� ���%s��� pavadinim��:"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Pervadinti katalog��"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Negaliu pervadinti katalogo ���%s���"
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo ���%s���"
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2368,11 +2373,11 @@ msgstr ""
 "I邸trinti paie邸kos katalog�� ���%s��� ?\n"
 "Tikri lai邸kai nebus trinami."
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "I邸trinti paie邸kos katalog��"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2385,20 +2390,20 @@ msgstr ""
 "\n"
 "Ar tikrai norite i邸trinti?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pa邸alinti katalogo ���%s���"
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "I邸valyti 邸iuk邸lin��"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "I邸trinti visus lai邸kus 邸iuk邸lin��je?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2407,34 +2412,34 @@ msgstr ""
 "Ar tikrai pa邸alinti d��転ut�� ���%s��� ?\n"
 "(lai邸kai NEBUS i邸trinti i邸 disko)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Pa邸alinti d��転ut��"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai i邸trinti IMAP4 s��skait�� ���%s���?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "I邸trinti IMAP4 s��skait��"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai i邸trinti naujien迭 grup�� ���%s���?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "I邸trinti naujien迭 grup��"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pa邸alinti naujien迭 s��skait�� ���%s���?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Pa邸alinti naujien迭 s��skait��"
 
diff --git a/po/nl.po b/po/nl.po
index ea3eaaaf..ac892e75 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -518,16 +518,16 @@ msgstr "Troepfilter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Codeconversie mislukt\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "kan het bestand met markeringen niet openen\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan bericht %d niet ophalen\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Adrukopdracht is ongeldig: '%s'\n"
@@ -950,10 +950,10 @@ msgid "/New _Folder"
 msgstr "/Nieuwe _map"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1032,7 +1032,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -1163,7 +1163,7 @@ msgid "Group"
 msgstr "Groep"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Accounts"
@@ -1251,8 +1251,8 @@ msgstr "/_Toevoegen..."
 msgid "/_Remove"
 msgstr "/_Verwijderen"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Eigenschappen..."
 
@@ -2003,12 +2003,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2176,174 +2176,179 @@ msgstr "Kies map"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/_Nieuwe map maken..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/Map _hernoemen"
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/Map ver_plaatsen..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/Map ver_wijderen"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/_Prullenbak legen"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/Nieuwe e-mail _ophalen"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/Accountlijst _verversen"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/Samenvatting _verversen"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Als gelezen markeren"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/Berichten _doorzoeken..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Zoekopdracht be_werken..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/Down_loaden"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/A_bonneren op een nieuwsgroep..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Nieuws_groep verwijderen"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Mapoverzicht wordt gemaakt...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nieuw"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Ongelezen"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Mapinfo wordt ingesteld...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Mapinfo wordt ingesteld..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Bezig met inlezen van map %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Bezig met inlezen van map %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Accountlijst verversen"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "De mappenboom zal opnieuw opgebouwd worden. Doorgaan?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Accountlijst wordt ververst..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Opnieuw opbouwen van de mappenboom mislukt."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Troep"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Downloaden van berichten in %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, 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:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2353,26 +2358,26 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan map '%s' niet hernoemen."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2381,11 +2386,11 @@ msgstr ""
 "Wilt u de zoekmap '%s' verwijderen?\n"
 "De berichten zelf zullen NIET worden verwijderd."
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "Zoekmap verwijderen"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2398,20 +2403,20 @@ msgstr ""
 "\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verplaatsen."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2420,34 +2425,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
diff --git a/po/pl.po b/po/pl.po
index befec973..0e586f54 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -508,16 +508,16 @@ msgstr "Niechciana poczta"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmine_get_text_content(): B����d konwersji kodu.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "nie mo甜na otworzy�� pliku zaznacze��\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nie mo甜na pobra�� wiadomo��ci %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "B����dny wiersz polecenia wydruku: \"%s\"\n"
@@ -941,10 +941,10 @@ msgid "/New _Folder"
 msgstr "/Nowy _katalog"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1023,7 +1023,7 @@ msgstr ""
 "Je��li usuniesz tylko katalog, adresy zostan�� przeniesione do nadrz��dnego "
 "katalogu."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Usu�� katalog"
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Katalog"
@@ -1246,8 +1246,8 @@ msgstr "/Dod_aj..."
 msgid "/_Remove"
 msgstr "/_Usu��"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_W��a��ciwo��ci..."
 
@@ -2006,12 +2006,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Podaj nazw�� nowego katalogu:"
 
@@ -2179,176 +2179,181 @@ msgstr "Wybierz katalog"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Wys��ane"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "��mietnik"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie mo甜na utworzy�� katalog '%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Utw坦rz _nowy katalog..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Zmie�� nazw�� katalogu..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Zmie�� nazw�� katalogu..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Usu�� katalog"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/Opr坦甜nij ��mie_tnik"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/Sprawd添 nowe wiadomo��_ci"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/Odbuduj drz_ewo katalog坦w"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Widok/_Od��wie甜 podsumowanie"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Zaznacz jako przeczytane"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/Wy_szukaj wiadomo��ci..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/Pobierz"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Subskrybuj grup�� news..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Usu�� g_rup�� news"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Tworzenie widoku katalog坦w...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nowy"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Ustawianie informacji o katalogu...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Ustawianie informacji o katalogu..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Przeszukiwanie katalogu %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Przeszukiwanie katalogu %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Odbuduj drzewo katalog坦w"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Drzewo katalog坦w zostnie przebudowane. Kontynuowa��?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Odbudowywanie drzewa katalog坦w..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "B����d podczas odbudowywania drzewa katalog坦w."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Sprawdzanie nowych wiadomo��ci we wszystkich katalogach..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomo��ci z %s..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "B����d podczas pobierania wiadomo��ci z `%s'."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2358,26 +2363,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:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowad添 now�� nazw�� dla '%s' :"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Zmie�� nazw�� katalogu"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nie mo甜na usun���� katalogu \"%s\"."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie mo甜na usun���� katalogu \"%s\"."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2386,12 +2391,12 @@ msgstr ""
 "Czy naprawd�� usun���� skrzynk�� \"%s\" ?\n"
 "(Wiadomo��ci NIE zostan�� usuni��te z dysku)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Usu�� katalog"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2402,21 +2407,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomo��ci w \"%s\" zostan�� usuni��te.\n"
 "Czy naprawd�� chcesz je usun����?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie mo甜na usun���� katalogu \"%s\"."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Opr坦甜nij ��mietnik"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usun���� wszystkie wiadomo��ci ze ��mietnika?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2425,34 +2430,34 @@ msgstr ""
 "Czy naprawd�� usun���� skrzynk�� \"%s\" ?\n"
 "(Wiadomo��ci NIE zostan�� usuni��te z dysku)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Usu�� skrzynk��"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawd�� chcesz usun���� konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Usu�� konto IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawd�� chcesz usun���� grup�� dyskusyjn�� \"%s\"?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Usu�� grup�� dyskusyjn��"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawd�� chcesz usun���� konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Usu�� konto grup dyskusyjnych"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 9e4fe770..da27338b 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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 "
@@ -516,16 +516,16 @@ msgstr "Filtro de spam"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Convers達o de c坦digo falhou.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "n達o foi poss鱈vel abrir o arquivo de marcas\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "n達o posso obter mensagem %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "O comando de impress達o 辿 inv叩lido: `%s'\n"
@@ -944,10 +944,10 @@ msgid "/New _Folder"
 msgstr "/Nova _Pasta"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1025,7 +1025,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Grupo"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Pasta"
@@ -1246,8 +1246,8 @@ msgstr "/_Adicionar"
 msgid "/_Remove"
 msgstr "/_Remover"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Propriedades..."
 
@@ -1999,12 +1999,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2173,174 +2173,179 @@ msgstr "Selecionar diret坦rio"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Fila de sa鱈da"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "n達o foi poss鱈vel criar a pasta `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Criar _nova pasta..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Renomear pasta..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/_Mover pasta..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Apagar pasta"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/Esvaziar _lixeira"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Buscar novas mensagens"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/_Atualizar 叩rvore de pastas"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/A_tualizar sum叩rio"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Marcar como lida"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_Procurar mensagens..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Ed_itar a condi巽達o de busca..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/_Baixar"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Assinar grupo de not鱈cias..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_Eliminar grupo de not鱈cias"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Criando visualizador de pasta...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nova"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "N達o lido"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Configurando informa巽探es da pasta...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Configurando informa巽探es da pasta..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Revisando pasta %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Revisando pasta %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "/_Atualizar 叩rvore de pastas"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "A 叩rvore de pastas ser叩 reconstru鱈da. Continuar?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Atualizando visualizador de pasta..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Falha ao tentar reconstruir a 叩rvore de pastas."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Checar novas mensagens em todas as pastas..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2350,26 +2355,26 @@ msgstr ""
 "(se voc棚 quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "N達o foi poss鱈vel renomear a pasta '%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "N達o foi poss鱈vel mover a pasta `%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2378,11 +2383,11 @@ msgstr ""
 "Apagar a pasta de busca '%s' ?\n"
 "As mensagens reais n達o ser達o apagadas."
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2395,20 +2400,20 @@ msgstr ""
 "\n"
 "Quer realmente apag叩-las?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "N達o foi poss鱈vel excluir a pasta `%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2417,34 +2422,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens N��O s達o apagadas do disco)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de not鱈cias `%s'?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de not鱈cias"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de not鱈cias `%s'?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de not鱈cias"
 
diff --git a/po/ro.po b/po/ro.po
index e1a2361e..0c253aa7 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+0900\n"
 "PO-Revision-Date: 2006-04-17 02:04+0200\n"
 "Last-Translator: Cristian Secar�� <cristi@secarica.ro>\n"
 "Language-Team: \n"
@@ -524,16 +524,16 @@ msgstr "Filtru spam"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): conversia codului a e��uat.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "nu se poate deschide fi��ierul de marcaj\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "nu se poate verifica mesajul %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Linia de comand�� pentru imprimare este invalid��: '%s'\n"
@@ -965,10 +965,10 @@ msgid "/New _Folder"
 msgstr "/_Folder nou"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1048,7 +1048,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "��tergere folder"
 
@@ -1181,7 +1181,7 @@ msgid "Group"
 msgstr "Grup��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Folder"
@@ -1270,8 +1270,8 @@ msgstr "/_Ad��ug��..."
 msgid "/_Remove"
 msgstr "/��te_rge"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Propriet��釘i..."
 
@@ -2028,12 +2028,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Folder nou"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Introduce釘i numele noului folder:"
 
@@ -2204,174 +2204,179 @@ msgstr "Selecteaz�� director"
 msgid "Select folder"
 msgstr "Selecteaz�� folder"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Primite (Inbox)"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Trimise"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coad��"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Ciorne"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "Folder nou"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Folderul '%s' nu a putut fi creat."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Creaz�� folder _nou..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Redenume��te folder..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/_Mut�� folder..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/��terge fol_der"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/Gole��_te gunoiul"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/Verifi_c�� pentru mesaje noi"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/R_econstruie��te arbore folder"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/Sumar act_ualizare"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Marcheaz�� ca citit"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/Caut�� me_saje..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/Ed_iteaz�� condi釘ia de c��utare..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/Desc_arc��"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Su_bscrie la newsgroup..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/��te_rge newsgroup"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Creare vizualizare folder...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nou"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Necitit"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Setare informa釘ii folder...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Setare informa釘ii folder..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Scanare folder %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Scanare folder %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Reconstruie��te arbore foldere"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Arborele de foldere va fi reconstruit. Continui ?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Reconstruc釘ie arbore foler..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Reconstruc釘ia arborelui de foldere a e��uat."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Verific�� pentru mesaje noi 樽n toate folderele..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Este selectat folderul %s\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Desc��rcare mesaje 樽n %s..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, 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:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2381,26 +2386,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:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduce釘i noul nume pentru '%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Redenume��te folder"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nu se poate redenumi folderul '%s'"
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nu se poate muta folderul '%s'"
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2409,11 +2414,11 @@ msgstr ""
 "��terge釘i folderul de c��utare '%s' ?\n"
 "Mesajele reale NU sunt ��terse de pe disc."
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "��terge folderul pentru c��utare"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2426,23 +2431,23 @@ msgstr ""
 "\n"
 "Chiar dori釘i s�� ��terge釘i ?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, 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:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Golire gunoi"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 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:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2451,34 +2456,34 @@ msgstr ""
 "Chiar ��terge釘i c��su釘a po��tal�� '%s' ?\n"
 "(Mesajele NU sunt ��terse de pe disc)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "��terge c��su釘a po��tal��"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sigur ��terge釘i contul IMAP4 '%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "��terge cont IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sigur ��terge釘i newsgroup-ul '%s' ?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "��terge newsgroup"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sigur ��terge釘i contul de ��tiri '%s' ?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "��terge cont de ��tiri"
 
diff --git a/po/ru.po b/po/ru.po
index 4d23f056..6c4fac3b 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,15 +1,15 @@
 # Russian translation for Sylpheed
-# Copyright (C) 2001-2003 Free Software Foundation, Inc.
+# Copyright (C) 2001-2006 Free Software Foundation, Inc.
 # First version by Aleksey Novodvorsky <aen@logic.ru>, 2001.
 # Updated by Sergey Vlasov <vsu@altlinux.ru>, 2001.
 # Updated by Dmitry S. Sivachenko <dima@Chg.RU>, 2001.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: sylpheed 1.0.0beta4\n"
+"Project-Id-Version: sylpheed 2.2.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-06-09 16:52+0900\n"
-"PO-Revision-Date: 2004-12-05 17:16+0300\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
 "MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
 
 #: libsylph/account.c:56
 msgid "Reading all config for each account...\n"
-msgstr "丼��亠仆亳亠 仆舒������仂亠从 ����亠��仆���� 亰舒仗亳��亠亶...\n"
+msgstr "丼��亠仆亳亠 仆舒������仂亠从 ��������仆���� 亰舒仗亳��亠亶...\n"
 
 #: libsylph/imap.c:465
 #, c-format
@@ -26,9 +26,8 @@ msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "弌仂亠亟亳仆亠仆亳亠 IMAP4 �� %s 仗��亠��于舒仆仂. ��仂������舒仆仂于仍亠仆亳亠 ��仂亠亟亳仆亠仆亳��...\n"
 
 #: libsylph/imap.c:516 libsylph/imap.c:522
-#, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
-msgstr "��舒��舒仍仂亞 ��亠��于亠��舒 IMAP4"
+msgstr "弌亠��于亠�� IMAP4 亰舒仗��亠��舒亠�� 亳��仗仂仍��亰仂于舒仆亳亠 从仂仄舒仆亟�� LOGIN.\n"
 
 #: libsylph/imap.c:597
 #, c-format
@@ -40,29 +39,29 @@ msgid "Can't start TLS session.\n"
 msgstr "��亠 ��亟舒仍仂���� 仆舒��舒���� ��亠舒仆�� TLS.\n"
 
 #: libsylph/imap.c:1115
-#, fuzzy, c-format
+#, c-format
 msgid "Getting message %d"
-msgstr "丕亟舒仍亠仆亳亠 ��仂仂弍��亠仆亳�� %d"
+msgstr "��仂仍����亠仆亳亠 ��仂仂弍��亠仆亳�� %d"
 
 #: libsylph/imap.c:1231
-#, fuzzy, c-format
+#, c-format
 msgid "Appending messages to %s (%d / %d)"
-msgstr "����仗��舒于从舒 ��仂仂弍��亠仆亳�� (%d / %d 弍舒亶��)"
+msgstr "��仂弍舒于仍亠仆亳亠 ��仂仂弍��亠仆亳亶 于 %s (%d / %d)"
 
 #: libsylph/imap.c:1323
-#, fuzzy, c-format
+#, c-format
 msgid "Moving messages %s to %s ..."
-msgstr "��仂仗亳��仂于舒仆亳亠 ��仂仂弍��亠仆亳�� %s%c%d 于 %s ...\n"
+msgstr "��亠��亠仄亠��亠仆亳亠 ��仂仂弍��亠仆亳亶 %s 于 %s ..."
 
 #: libsylph/imap.c:1329
-#, fuzzy, c-format
+#, c-format
 msgid "Copying messages %s to %s ..."
-msgstr "��仂仗亳��仂于舒仆亳亠 ��仂仂弍��亠仆亳�� %s%c%d 于 %s ...\n"
+msgstr "��仂仗亳��仂于舒仆亳亠 ��仂仂弍��亠仆亳亶 %s 于 %s ..."
 
 #: libsylph/imap.c:1468
-#, fuzzy, c-format
+#, c-format
 msgid "Removing messages %s"
-msgstr "��仂仍����亠仆亳亠 ��仂仂弍��亠仆亳亶 �� %s..."
+msgstr "丕亟舒仍亠仆亳亠 ��仂仂弍��亠仆亳亶 %s"
 
 #: libsylph/imap.c:1474
 #, c-format
@@ -71,12 +70,12 @@ msgstr "仆亠 ��亟舒仍仂���� ������舒仆仂于亳���� ��仍舒亞 ��亟舒仍亠仆亳��: %s\n
 
 #: libsylph/imap.c:1482 libsylph/imap.c:1577
 msgid "can't expunge\n"
-msgstr "仆亠 ��亟舒仍仂���� 仂��亳����亳���� 仗舒仗从�� 仂�� ��亟舒仍亠仆仆���� ��仂仂弍��亠仆亳亶\n"
+msgstr "仆亠 ��亟舒仍仂���� 仂��亳����亳���� 仗舒仗从�� 仂�� ��亟舒仍��仆仆���� ��仂仂弍��亠仆亳亶\n"
 
 #: libsylph/imap.c:1565
-#, fuzzy, c-format
+#, c-format
 msgid "Removing all messages in %s"
-msgstr "��仂仍����亠仆亳亠 ��仂仂弍��亠仆亳亶 �� %s..."
+msgstr "丕亟舒仍亠仆亳亠 于��亠�� ��仂仂弍��亠仆亳亶 亳亰 %s"
 
 #: libsylph/imap.c:1571
 msgid "can't set deleted flags: 1:*\n"
@@ -98,38 +97,38 @@ msgstr "仗��仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仗仂仍����亠仆亳亳 LIST.\n"
 #: libsylph/imap.c:2008
 #, c-format
 msgid "Can't create '%s'\n"
-msgstr "����亳弍从舒 仗��亳 ��仂亰亟舒仆亳亳 '%s'\n"
+msgstr "����亳弍从舒 仗��亳 ��仂亰亟舒仆亳亳 \"%s\"\n"
 
 #: libsylph/imap.c:2013
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
-msgstr "����亳弍从舒 仗��亳 ��仂亰亟舒仆亳亳 '%s' 于仆������亳 INBOX\n"
+msgstr "����亳弍从舒 仗��亳 ��仂亰亟舒仆亳亳 \"%s\" 于仆������亳 INBOX\n"
 
 #: libsylph/imap.c:2074
 msgid "can't create mailbox: LIST failed\n"
-msgstr "仆亠 ��亟舒亠������ ��仂亰亟舒���� 仗仂����仂于��亶 ����亳从: 仂��亳弍从舒 LIST\n"
+msgstr "仆亠 ��亟舒仍仂���� ��仂亰亟舒���� 仗仂����仂于��亶 ����亳从: 仂��亳弍从舒 LIST\n"
 
 #: libsylph/imap.c:2094
 msgid "can't create mailbox\n"
-msgstr "仆亠 ��亟舒亠������ ��仂亰亟舒���� 仗仂����仂于��亶 ����亳从\n"
+msgstr "仆亠 ��亟舒仍仂���� ��仂亰亟舒���� 仗仂����仂于��亶 ����亳从\n"
 
 #: libsylph/imap.c:2198
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
-msgstr "仆亠 ��亟舒亠������ 仗亠��亠亳仄亠仆仂于舒���� 仗仂����仂于��亶 ����亳从 %s 于 %s\n"
+msgstr "仆亠 ��亟舒仍仂���� 仗亠��亠亳仄亠仆仂于舒���� 仗仂����仂于��亶 ����亳从 %s 于 %s\n"
 
 #: libsylph/imap.c:2278
 msgid "can't delete mailbox\n"
-msgstr "仆亠 ��亟舒亠������ ��亟舒仍亳���� 仗仂����仂于��亶 ����亳从\n"
+msgstr "仆亠 ��亟舒仍仂���� ��亟舒仍亳���� 仗仂����仂于��亶 ����亳从\n"
 
 #: libsylph/imap.c:2322
 msgid "can't get envelope\n"
 msgstr "仆亠 ��亟舒仍仂���� 仗仂仍����亳���� 亟舒仆仆��亠 从仂仆于亠����舒\n"
 
 #: libsylph/imap.c:2335
-#, fuzzy, c-format
+#, c-format
 msgid "Getting message headers (%d / %d)"
-msgstr "����仗��舒于从舒 ��仂仂弍��亠仆亳�� (%d / %d 弍舒亶��)"
+msgstr "��仂仍����亠仆亳亠 亰舒亞仂仍仂于从仂于 ��仂仂弍��亠仆亳亶 (%d / %d)"
 
 #: libsylph/imap.c:2345
 msgid "error occurred while getting envelope.\n"
@@ -152,7 +151,7 @@ msgstr "��亠 ��亟舒仍仂���� 仂��从�������� ��亠舒仆�� ��于�磶亳 IMAP4 c %s:%d\n
 
 #: libsylph/imap.c:2573
 msgid "can't get namespace\n"
-msgstr "仆亠 ��亟舒仍仂���� 仗仂仍����亳���� 仗��仂������舒仆����于仂 亳仄亠仆\n"
+msgstr "仆亠 ��亟舒仍仂���� 仗仂仍����亳���� 仗��仂������舒仆����于仂 亳仄��仆\n"
 
 #: libsylph/imap.c:3106
 #, c-format
@@ -160,9 +159,8 @@ msgid "can't select folder: %s\n"
 msgstr "仆亠于仂亰仄仂亢仆仂 于��弍��舒���� 仗舒仗从��: %s\n"
 
 #: libsylph/imap.c:3141
-#, fuzzy
 msgid "error on imap command: STATUS\n"
-msgstr "仂��亳弍从舒 仗��亳 于��仗仂仍仆亠仆亳亳 从仂仄舒仆亟�� IMAP: CLOSE\n"
+msgstr "仂��亳弍从舒 仗��亳 于��仗仂仍仆亠仆亳亳 从仂仄舒仆亟�� IMAP: STATUS\n"
 
 #: libsylph/imap.c:3284
 msgid "IMAP4 authentication failed.\n"
@@ -225,12 +223,12 @@ msgstr "��仂仍����亠仆亳亠 ��仂仂弍��亠仆亳亶 亳亰 %s 于 %s...\n"
 
 #: libsylph/mbox.c:79
 msgid "can't read mbox file.\n"
-msgstr "����亳弍从舒 ����亠仆亳�� mbox-��舒亶仍舒.\n"
+msgstr "仂��亳弍从舒 ����亠仆亳�� ��舒亶仍舒 mbox.\n"
 
 #: libsylph/mbox.c:86
 #, c-format
 msgid "invalid mbox format: %s\n"
-msgstr "仆亠于亠��仆��亶 ��仂��仄舒�� ����亳从舒: %s\n"
+msgstr "仆亠于亠��仆��亶 ��仂��仄舒�� 仗仂����仂于仂亞仂 ����亳从舒: %s\n"
 
 #: libsylph/mbox.c:93
 #, c-format
@@ -247,7 +245,7 @@ msgid ""
 "unescaped From found:\n"
 "%s"
 msgstr ""
-"仆舒亶亟亠仆舒 仆亠亰舒��亳��亠仆仆舒�� ������仂从舒 From:\n"
+"仆舒亶亟亠仆舒 仆亠亰舒��亳����仆仆舒�� ������仂从舒 From:\n"
 "%s"
 
 #: libsylph/mbox.c:250
@@ -258,11 +256,11 @@ msgstr "仆舒亶亟亠仆仂 %d ��仂仂弍��亠仆亳亶.\n"
 #: libsylph/mbox.c:268
 #, c-format
 msgid "can't create lock file %s\n"
-msgstr "仂��亳弍从舒 ��仂亰亟舒仆亳�� lock-��舒亶仍舒 %s\n"
+msgstr "仂��亳弍从舒 ��仂亰亟舒仆亳�� ��舒亶仍舒 弍仍仂从亳��仂于从亳 %s\n"
 
 #: libsylph/mbox.c:269
 msgid "use 'flock' instead of 'file' if possible.\n"
-msgstr "亳��仗仂仍��亰��亶��亠 'flock' 于仄亠����仂 'file', 亠��仍亳 于仂亰仄仂亢仆仂.\n"
+msgstr "亳��仗仂仍��亰��亶��亠 \"flock\" 于仄亠����仂 \"file\", 亠��仍亳 于仂亰仄仂亢仆仂.\n"
 
 #: libsylph/mbox.c:281
 #, c-format
@@ -326,8 +324,8 @@ msgid ""
 "File `%s' already exists.\n"
 "Can't create folder."
 msgstr ""
-"个舒亶仍 '%s' ������亠����于��亠��.\n"
-"��亠仍��亰�� ��仂亰亟舒���� 仗舒仗从��."
+"个舒亶仍 \"%s\" ��亢亠 ������亠����于��亠��.\n"
+"��亠仍��亰�� ��仂亰亟舒���� 仗舒仗从�� �� ��舒从亳仄 亢亠 亳仄亠仆亠仄."
 
 #: libsylph/mh.c:1395
 #, c-format
@@ -340,6 +338,13 @@ msgid ""
 "\n"
 "\tG_FILENAME_ENCODING=@locale\n"
 msgstr ""
+"��仄�� 从舒��舒仍仂亞舒\n"
+"\"%s\" 仆亠 �磦仍�磳������ 亟仂仗������亳仄仂亶 ������仂从仂亶 于 从仂亟亳��仂于从亠 UTF-8.\n"
+"��仂亰仄仂亢仆仂, 亟仍�� ����仂亞仂 亳仄亠仆亳 亳��仗仂仍��亰��亠������ 从仂亟亳��仂于从舒 仍仂从舒仍亳.\n"
+"�� ����仂仄 ��仍����舒亠 仆亠仂弍��仂亟亳仄仂 ������舒仆仂于亳���� ��仍亠亟���ﾑ����� 仗亠��亠仄亠仆仆���� 仂从����亢亠仆亳��\n"
+"(��仄. 弍仂仍亠亠 仗仂亟��仂弍仆仂亠 仂仗亳��舒仆亳亠 于 ��舒亶仍亠 README):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
 
 #: libsylph/news.c:207
 #, c-format
@@ -492,7 +497,7 @@ msgstr "仂��亳弍从舒 ��亠舒仆��舒 POP3\n"
 #: libsylph/prefs_account.c:217 libsylph/prefs_account.c:231
 #: src/prefs_display_header.c:413 src/prefs_display_header.c:438
 msgid "failed to write configuration to file\n"
-msgstr "仂��亳弍从舒 亰舒仗亳��亳 仆舒������仂亠从 于 ��舒亶仍\n"
+msgstr "仂��亳弍从舒 仗��亳 亰舒仗亳��亳 仆舒������仂亠从 于 ��舒亶仍\n"
 
 #: libsylph/prefs.c:239
 #, c-format
@@ -504,27 +509,26 @@ msgid "Configuration is saved.\n"
 msgstr "��舒������仂亶从亳 ��仂����舒仆亠仆��.\n"
 
 #: libsylph/prefs_common.c:498
-#, fuzzy
 msgid "Junk mail filter"
-msgstr "仗舒仗从��:"
+msgstr "个亳仍������ ��仗舒仄舒"
 
 #: libsylph/procmime.c:1100
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): ����亳弍从舒 仗��亠仂弍��舒亰仂于舒仆亳�� 从仂亟亳��仂于从亳.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "仂��亳弍从舒 仂��从������亳�� ��舒亶仍舒 仗仂仄亠��仂从\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "仆亠 ��亟舒仍仂���� 仗仂仍����亳���� ��仂仂弍��亠仆亳亠 %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
-msgstr "��亠仗��舒于亳仍��仆舒�� 从仂仄舒仆亟舒 仗亠��舒��亳: '%s'\n"
+msgstr "��亠仗��舒于亳仍��仆舒�� 从仂仄舒仆亟舒 仗亠��舒��亳: \"%s\"\n"
 
 #: libsylph/recv.c:140
 msgid "error occurred while retrieving data.\n"
@@ -629,10 +633,10 @@ msgid ""
 "version.\n"
 "\n"
 msgstr ""
-"亅��舒 仗��仂亞��舒仄仄舒 �磦仍�磳������ ��于仂弍仂亟仆仂亶; ���� 仄仂亢亠��亠 亠亠 ��舒��仗��仂������舒仆������ 亳/亳仍亳 "
-"仄仂亟亳��亳��亳��仂于舒���� 仆舒 ����仍仂于亳���� 丕仆亳于亠����舒仍��仆仂亶 ��弍��亠����于亠仆仆仂亶 仍亳��亠仆亰亳亳 GNU, "
-"仂仗��弍仍亳从仂于舒仆仆仂亶 Free Software Foundation; 于亠����亳亠亶 2 亳仍亳 (仆舒 ��舒��亠 ����仄仂����亠仆亳亠) "
-"弍仂仍亠亠 仗仂亰亟仆亠亶 于亠����亳亠亶.\n"
+"亅��舒 仗��仂亞��舒仄仄舒 �磦仍�磳������ ��于仂弍仂亟仆仂亶; ���� 仄仂亢亠��亠 亠�� ��舒��仗��仂������舒仆������ 亳/亳仍亳 "
+"仄仂亟亳��亳��亳��仂于舒���� 仆舒 ����仍仂于亳���� 丕仆亳于亠����舒仍��仆仂亶 ��弍��亠����于亠仆仆仂亶 ��亳��亠仆亰亳亳 GNU (GNU "
+"General Public License), 仂仗��弍仍亳从仂于舒仆仆仂亶 Free Software Foundation; 于亠����亳亳 2 "
+"亳仍亳 (仆舒 ��舒��亠 ����仄仂����亠仆亳亠) 弍仂仍亠亠 仗仂亰亟仆亠亶 于亠����亳亳.\n"
 "\n"
 
 #: src/about.c:233
@@ -645,8 +649,8 @@ msgid ""
 msgstr ""
 "亅��舒 仗��仂亞��舒仄仄舒 ��舒��仗��仂������舒仆�磳������ 于 仆舒亟亠亢亟亠, ����仂 仂仆舒 弍��亟亠�� 仗仂仍亠亰仆仂亶, 仆仂 ������ "
 "��弌亊����丱 ����������丐����; 亟舒亢亠 弍亠亰 仆亠�磦仆���� 亞舒��舒仆��亳亶 仗仂 丐��������������丕 弌��弌丐��亊����豫 亳仍亳 "
-"����������������弌丐�� ����亊 ��������������������乘丱 丶��������.  丼亳��舒亶��亠 丕仆亳于亠����舒仍��仆���� ��弍��亠����于亠仆仆���� "
-"仍亳��亠仆亰亳�� GNU, 亠��仍亳 ��仂��亳��亠 ��亰仆舒���� 亟亠��舒仍亳.\n"
+"����������������弌丐�� ����亊 ��������������������乘丱 丶��������.  丼亳��舒亶��亠 丕仆亳于亠����舒仍��仆���� ��弍��亠����于亠仆仆���� "
+"��亳��亠仆亰亳�� GNU, 亠��仍亳 ��仂��亳��亠 ��亰仆舒���� 亟亠��舒仍亳.\n"
 
 #: src/about.c:239
 msgid ""
@@ -654,9 +658,10 @@ msgid ""
 "this program; if not, write to the Free Software Foundation, Inc., 59 Temple "
 "Place - Suite 330, Boston, MA 02111-1307, USA."
 msgstr ""
-"��仄亠����亠 �� ����仂亶 仗��仂亞��舒仄仄仂亶 ���� 亟仂仍亢仆�� 仗仂仍����亳���� 从仂仗亳�� 丕仆亳于亠����舒仍��仆仂亶 ��弍��亠����于亠仆仆仂亶 "
-"仍亳��亠仆亰亳亳 GNU; 亠��仍亳 ����仂亞仂 仆亠 ��仍����亳仍仂����, -- 仆舒仗亳��亳��亠 于 Free Software "
-"Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA."
+"��仄亠����亠 �� ����仂亶 仗��仂亞��舒仄仄仂亶 于�� 亟仂仍亢仆�� 弍��仍亳 仗仂仍����亳���� 从仂仗亳�� 丕仆亳于亠����舒仍��仆仂亶 "
+"��弍��亠����于亠仆仆仂亶 ��亳��亠仆亰亳亳 GNU; 亠��仍亳 ����仂亞仂 仆亠 ��仍����亳仍仂���� -- 仆舒仗亳��亳��亠 于 Free "
+"Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-"
+"1307, USA."
 
 #: src/account_dialog.c:137
 msgid ""
@@ -664,19 +669,19 @@ msgid ""
 "Please close all the composing windows before editing the accounts."
 msgstr ""
 "��亠从仂��仂����亠 仂从仆舒 �� 仆亠仂��仗��舒于仍亠仆仆��仄亳 ��仂仂弍��亠仆亳�礆亳 仂��从��������.\n"
-"��仂亢舒仍��亶����舒, 亰舒从��仂亶��亠 亳�� 仗亠��亠亟 亳亰仄亠仆亠仆亳亠仄 ����亠��仆���� 亰舒仗亳��亠亶."
+"��仂亢舒仍��亶����舒, 亰舒从��仂亶��亠 亳�� 仗亠��亠亟 亳亰仄亠仆亠仆亳亠仄 ��������仆���� 亰舒仗亳��亠亶."
 
 #: src/account_dialog.c:143
 msgid "Opening account edit window...\n"
-msgstr "����从������亳亠 仂从仆舒 ��亠亟舒从��亳��仂于舒仆亳�� ����亠��仆���� 亰舒仗亳��亠亶...\n"
+msgstr "����从������亳亠 仂从仆舒 ��亠亟舒从��亳��仂于舒仆亳�� ��������仆���� 亰舒仗亳��亠亶...\n"
 
 #: src/account_dialog.c:288
 msgid "Creating account edit window...\n"
-msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 ��亠亟舒从��亳��仂于舒仆亳�� ����亠��仆���� 亰舒仗亳��亠亶...\n"
+msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 ��亠亟舒从��亳��仂于舒仆亳�� ��������仆���� 亰舒仗亳��亠亶...\n"
 
 #: src/account_dialog.c:293
 msgid "Edit accounts"
-msgstr "��亠亟舒从��亳��仂于舒仆亳亠 ����亠��仆���� 亰舒仗亳��亠亶"
+msgstr "��亠亟舒从��亳��仂于舒仆亳亠 ��������仆���� 亰舒仗亳��亠亶"
 
 #: src/account_dialog.c:311
 msgid ""
@@ -684,8 +689,8 @@ msgid ""
 "on the `G' column to enable message retrieval by `Get all'."
 msgstr ""
 "��仂于��亠 ��仂仂弍��亠仆亳�� 弍��亟���� 仗��亳仆亳仄舒�������� 于 ��从舒亰舒仆仆仂仄 仗仂���磲从亠.\n"
-"��仂仄亠������亠 于 从仂仍仂仆从亠 'G' ����亠��仆��亠 亰舒仗亳��亳, 从仂��仂����亠 仆��亢仆仂 仗��仂于亠��������\n"
-"仗仂 从仂仄舒仆亟亠 '��仂仍����亳���� 于��亠'."
+"��仂仄亠������亠 于 从仂仍仂仆从亠 \"G\" ��������仆��亠 亰舒仗亳��亳, 从仂��仂����亠 仆��亢仆仂 仗��仂于亠��������\n"
+"仗仂 从仂仄舒仆亟亠 \"��仂仍����亳���� 于��亠\"."
 
 #: src/account_dialog.c:366 src/addressadd.c:192 src/addressbook.c:491
 #: src/compose.c:4332 src/editaddress.c:200 src/editaddress.c:942
@@ -709,23 +714,21 @@ msgid "Edit"
 msgstr "��亰仄亠仆亳����"
 
 #: src/account_dialog.c:434
-#, fuzzy
 msgid " _Set as default account "
-msgstr " 丕����舒仆仂于亳���� ����亠��仆���� 亰舒仗亳���� 仗仂 ��仄仂仍��舒仆亳�� "
+msgstr "丕����舒仆仂于亳���� ��������仆���� 亰舒仗亳���� 仗仂 ��仄仂仍��舒仆亳��"
 
 #: src/account_dialog.c:487
-#, fuzzy, c-format
+#, c-format
 msgid "Do you really want to delete the account '%s'?"
-msgstr "���� 亟亠亶����于亳��亠仍��仆仂 ��仂��亳��亠 ��亟舒仍亳���� ������ 亰舒仗亳����?"
+msgstr "���� 亟亠亶����于亳��亠仍��仆仂 ��仂��亳��亠 ��亟舒仍亳���� ��������仆���� 亰舒仗亳���� \"%s\"?"
 
 #: src/account_dialog.c:489 src/prefs_filter.c:688
-#, fuzzy
 msgid "(Untitled)"
-msgstr "��亠亰 仆舒亰于舒仆亳��"
+msgstr "(��亠亰 仆舒亰于舒仆亳��)"
 
 #: src/account_dialog.c:490
 msgid "Delete account"
-msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳����"
+msgstr "丕亟舒仍亳���� ��������仆���� 亰舒仗亳����"
 
 #: src/action.c:331
 #, c-format
@@ -747,7 +750,7 @@ msgid ""
 "because it contains %%f, %%F or %%p."
 msgstr ""
 "����弍��舒仆仆仂亠 亟亠亶����于亳亠 仆亠 仄仂亢亠�� 弍������ 于��仗仂仍仆亠仆仂 于 仂从仆亠 ��仂亰亟舒仆亳�� ��仂仂弍��亠仆亳��,\n"
-"��舒从 从舒从 仂仆仂 ��仂亟亠��亢亳�� %%f, %%F or %%p."
+"��舒从 从舒从 从仂仄舒仆亟舒 亟仍�� ����仂亞仂 亟亠亶����于亳�� ��仂亟亠��亢亳�� %%f, %%F 亳仍亳 %%p."
 
 #: src/action.c:708
 #, c-format
@@ -778,7 +781,7 @@ msgstr "--- ����仗仂仍仆�磳������: %s\n"
 #: src/action.c:1028
 #, c-format
 msgid "--- Ended: %s\n"
-msgstr "--- ��舒于亠����亠仆仂 于��仗仂仍仆亠仆亳亠: %s\n"
+msgstr "--- ��舒于亠����亠仆仂: %s\n"
 
 #: src/action.c:1060
 msgid "Action's input/output"
@@ -800,7 +803,7 @@ msgid ""
 "  %s"
 msgstr ""
 "��于亠亟亳��亠 仗舒��舒仄亠���� 亟仍�� ��仍亠亟���ﾑ�亠亞仂 亟亠亶����于亳��\n"
-"(仂仆 弍��亟亠�� 仗仂亟����舒于仍亠仆 于仄亠����仂 '%%h'):\n"
+"(仂仆 弍��亟亠�� 仗仂亟����舒于仍亠仆 于仄亠����仂 \"%%h\"):\n"
 "  %s"
 
 #: src/action.c:1309
@@ -815,7 +818,7 @@ msgid ""
 "  %s"
 msgstr ""
 "��于亠亟亳��亠 仗舒��舒仄亠���� 亟仍�� ��仍亠亟���ﾑ�亠亞仂 亟亠亶����于亳��\n"
-"(仂仆 弍��亟亠�� 仗仂亟����舒于仍亠仆 于仄亠����仂 '%%u'):\n"
+"(仂仆 弍��亟亠�� 仗仂亟����舒于仍亠仆 于仄亠����仂 \"%%u\"):\n"
 "  %s"
 
 #: src/action.c:1318
@@ -858,9 +861,8 @@ msgid "/_File/New _JPilot"
 msgstr "/个舒亶仍/��仂于��亶 ��舒亶仍 JPilot"
 
 #: src/addressbook.c:344
-#, fuzzy
 msgid "/_File/New _LDAP Server"
-msgstr "/个舒亶仍/��仂于��亶 ��亠��于亠��"
+msgstr "/个舒亶仍/��仂于��亶 ��亠��于亠�� LDAP"
 
 #: src/addressbook.c:346 src/addressbook.c:349 src/compose.c:524
 #: src/compose.c:529 src/compose.c:532 src/compose.c:535 src/mainwindow.c:507
@@ -945,10 +947,10 @@ msgid "/New _Folder"
 msgstr "/��仂于舒�� 仗舒仗从舒"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1018,7 +1020,7 @@ msgid "Really delete the address(es)?"
 msgstr "��亠亶����于亳��亠仍��仆仂 ��亟舒仍亳���� 舒亟��亠��(舒)?"
 
 #: src/addressbook.c:1669
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Do you want to delete the folder AND all addresses in `%s' ?\n"
 "If deleting the folder only, addresses will be moved into parent folder."
@@ -1026,24 +1028,22 @@ msgstr ""
 "���� ��仂��亳��亠 ��亟舒仍亳���� 仗舒仗从�� \"%s\" 亳 于��亠 舒亟��亠��舒 于 仆亠亶?\n"
 "����仍亳 ��亟舒仍亳���� ��仂仍��从仂 仗舒仗从��, 舒亟��亠��舒 弍��亟���� 仗亠��亠仄亠��亠仆�� 于 ��仂亟亳��亠仍����从���� 仗舒仗从��."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "丕亟舒仍亳���� 仗舒仗从��"
 
 #: src/addressbook.c:1672
-#, fuzzy
 msgid "_Folder only"
 msgstr "丐仂仍��从仂 仗舒仗从��"
 
 #: src/addressbook.c:1672
-#, fuzzy
 msgid "Folder and _addresses"
 msgstr "��舒仗从�� 亳 舒亟��亠��舒"
 
 #: src/addressbook.c:1677
 #, c-format
 msgid "Really delete `%s' ?"
-msgstr "��亠亶����于亳��亠仍��仆仂 ��亟舒仍亳���� '%s' ?"
+msgstr "��亠亶����于亳��亠仍��仆仂 ��亟舒仍亳���� \"%s\"?"
 
 #: src/addressbook.c:2363 src/addressbook.c:2496
 msgid "New user, could not save index file."
@@ -1160,7 +1160,7 @@ msgid "Group"
 msgstr "������仗仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "��舒仗从舒"
@@ -1179,7 +1179,7 @@ msgstr "弌亠��于亠�� LDAP"
 
 #: src/addrindex.c:95 src/addrindex.c:99 src/addrindex.c:106
 msgid "Common address"
-msgstr "��亟��亠��舒 仂��亞舒仆亳亰舒��亳亶"
+msgstr "��弍��亳亠 舒亟��亠��舒"
 
 #: src/addrindex.c:96 src/addrindex.c:100 src/addrindex.c:107
 msgid "Personal address"
@@ -1227,7 +1227,7 @@ msgstr "弌亳仆亳亶"
 
 #: src/colorlabel.c:51
 msgid "Green"
-msgstr "��亠仍亠仆��亶"
+msgstr "��亠仍��仆��亶"
 
 #: src/colorlabel.c:52
 msgid "Brown"
@@ -1248,8 +1248,8 @@ msgstr "/��仂弍舒于亳����..."
 msgid "/_Remove"
 msgstr "/丕亟舒仍亳����"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/弌于仂亶����于舒..."
 
@@ -1279,20 +1279,19 @@ msgstr "/个舒亶仍/������舒于亳���� ��亠从���� 亳亰 ��舒亶仍舒"
 
 #: src/compose.c:533
 msgid "/_File/Insert si_gnature"
-msgstr "/个舒亶仍/��仂弍舒于亳���� 仗仂亟仗亳����"
+msgstr "/个舒亶仍/������舒于亳���� 仗仂亟仗亳����"
 
 #: src/compose.c:534
-#, fuzzy
 msgid "/_File/A_ppend signature"
-msgstr "/个舒亶仍/��仂弍舒于亳���� 仗仂亟仗亳����"
+msgstr "/个舒亶仍/��仂弍舒于亳���� 仗仂亟仗亳���� 于 从仂仆亠��"
 
 #: src/compose.c:539
 msgid "/_Edit/_Undo"
-msgstr "/����舒于从舒/����从舒��"
+msgstr "/����舒于从舒/����仄亠仆亳����"
 
 #: src/compose.c:540
 msgid "/_Edit/_Redo"
-msgstr "/����舒于从舒/����从舒�� 仂��从舒��舒"
+msgstr "/����舒于从舒/��仂于��仂��亳����"
 
 #: src/compose.c:541 src/compose.c:548 src/mainwindow.c:525
 #: src/messageview.c:149
@@ -1317,7 +1316,7 @@ msgstr "/����舒于从舒/������舒于亳���� 从舒从 ��亳��舒����"
 
 #: src/compose.c:547 src/mainwindow.c:523 src/messageview.c:148
 msgid "/_Edit/Select _all"
-msgstr "/����舒于从舒/����亟亠仍亳���� 于��亠"
+msgstr "/����舒于从舒/����亟亠仍亳���� 于����"
 
 #: src/compose.c:549
 msgid "/_Edit/_Wrap current paragraph"
@@ -1325,7 +1324,7 @@ msgstr "/����舒于从舒/������仂��仄舒��亳��仂于舒���� 舒弍亰舒��"
 
 #: src/compose.c:551
 msgid "/_Edit/Wrap all long _lines"
-msgstr "/����舒于从舒/������仂��仄舒��亳��仂于舒���� 于��亠 ��仂仂弍��亠仆亳亠"
+msgstr "/����舒于从舒/������仂��仄舒��亳��仂于舒���� 于���� ��仂仂弍��亠仆亳亠"
 
 #: src/compose.c:553
 msgid "/_Edit/Aut_o wrapping"
@@ -1372,140 +1371,114 @@ msgid "/_View/_Attachment"
 msgstr "/��亳亟/��仍仂亢亠仆亳��"
 
 #: src/compose.c:571 src/mainwindow.c:611 src/messageview.c:160
-#, fuzzy
 msgid "/_View/Character _encoding"
-msgstr "/��亳亟/弌仂����亳��仂于从舒/��仂 ��弍��于舒仆亳��"
+msgstr "/��亳亟/��仂亟亳��仂于从舒"
 
 #: src/compose.c:572
 msgid "/_View/Character _encoding/_Automatic"
-msgstr ""
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��于��仂仂仗��亠亟亠仍亠仆亳亠"
 
 #: src/compose.c:574 src/compose.c:580 src/compose.c:586 src/compose.c:590
 #: src/compose.c:596 src/compose.c:600 src/compose.c:606 src/compose.c:612
 #: src/compose.c:616 src/compose.c:626 src/compose.c:630 src/compose.c:638
 #: src/compose.c:642 src/mainwindow.c:607 src/mainwindow.c:614
 #: src/messageview.c:156
-#, fuzzy
 msgid "/_View/Character _encoding/---"
-msgstr "/��亳亟/弌仂����亳��仂于从舒/��仂 ��弍��于舒仆亳��"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/---"
 
 #: src/compose.c:576 src/mainwindow.c:615 src/messageview.c:164
-#, fuzzy
 msgid "/_View/Character _encoding/7bit ascii (US-ASC_II)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/7-弍亳��仆��亶 ascii (US-ASC_II)"
 
 #: src/compose.c:578 src/mainwindow.c:617 src/messageview.c:167
-#, fuzzy
 msgid "/_View/Character _encoding/Unicode (_UTF-8)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/Unicode (_UTF-8)"
 
 #: src/compose.c:582 src/mainwindow.c:621 src/messageview.c:170
-#, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-_1)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��舒仗舒亟仆仂亠于��仂仗亠亶��从舒�� (ISO-8859-_1)"
 
 #: src/compose.c:584 src/mainwindow.c:623 src/messageview.c:172
-#, fuzzy
 msgid "/_View/Character _encoding/Western European (ISO-8859-15)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��舒仗舒亟仆仂亠于��仂仗亠亶��从舒�� (ISO-8859-15)"
 
 #: src/compose.c:588 src/mainwindow.c:629 src/messageview.c:177
-#, fuzzy
 msgid "/_View/Character _encoding/Central European (ISO-8859-_2)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/丶亠仆����舒仍��仆仂亠于��仂仗亠亶��从舒�� (ISO-8859-_2)"
 
 #: src/compose.c:592 src/mainwindow.c:633 src/messageview.c:180
-#, fuzzy
 msgid "/_View/Character _encoding/_Baltic (ISO-8859-13)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��舒仍��亳亶��从舒�� (ISO-8859-13)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/����亳弍舒仍��亳亶��从舒�� (ISO-8859-13)"
 
 #: src/compose.c:594 src/mainwindow.c:635 src/messageview.c:182
-#, fuzzy
 msgid "/_View/Character _encoding/Baltic (ISO-8859-_4)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��舒仍��亳亶��从舒�� (ISO-8859-_4)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/����亳弍舒仍��亳亶��从舒�� (ISO-8859-_4)"
 
 #: src/compose.c:598 src/mainwindow.c:639 src/messageview.c:185
-#, fuzzy
 msgid "/_View/Character _encoding/Greek (ISO-8859-_7)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/����亠��亠��从舒�� (ISO-8859-_7)"
 
 #: src/compose.c:602 src/mainwindow.c:643 src/messageview.c:188
-#, fuzzy
 msgid "/_View/Character _encoding/Arabic (ISO-8859-_6)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��舒仍��亳亶��从舒�� (ISO-8859-_4)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/����舒弍��从舒�� (ISO-8859-_6)"
 
 #: src/compose.c:604 src/mainwindow.c:645 src/messageview.c:190
-#, fuzzy
 msgid "/_View/Character _encoding/Arabic (Windows-1256)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��亳仍仍亳��亠��从舒�� _Win (Windows-1251)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/����舒弍��从舒�� (Windows-1256)"
 
 #: src/compose.c:608 src/mainwindow.c:649 src/messageview.c:193
-#, fuzzy
 msgid "/_View/Character _encoding/Hebrew (ISO-8859-_8)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/����亠��亠��从舒�� (ISO-8859-_7)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��于��亳�� (ISO-8859-_8)"
 
 #: src/compose.c:610 src/mainwindow.c:651 src/messageview.c:195
-#, fuzzy
 msgid "/_View/Character _encoding/Hebrew (Windows-1255)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��亳仍仍亳��亠��从舒�� _Win (Windows-1251)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��于��亳�� (Windows-1255)"
 
 #: src/compose.c:614 src/mainwindow.c:655 src/messageview.c:198
-#, fuzzy
 msgid "/_View/Character _encoding/Turkish (ISO-8859-_9)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/丐����亠��从舒�� (ISO-8859-_9)"
 
 #: src/compose.c:618 src/mainwindow.c:659 src/messageview.c:201
-#, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (ISO-8859-_5)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��亳仍仍亳��亠��从舒�� (ISO-8859-_5)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��亳仍仍亳��舒 (ISO-8859-_5)"
 
 #: src/compose.c:620 src/mainwindow.c:661 src/messageview.c:203
-#, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-_R)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��������从舒�� (KOI8-_R)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��亳仍仍亳��舒 (KOI8-_R)"
 
 #: src/compose.c:622 src/mainwindow.c:663 src/messageview.c:205
-#, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (KOI8-U)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/丕从��舒亳仆��从舒�� (KOI8-_U)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��亳仍仍亳��舒\\/丕从��舒亳仆舒 (KOI8-_U)"
 
 #: src/compose.c:624 src/mainwindow.c:665 src/messageview.c:207
-#, fuzzy
 msgid "/_View/Character _encoding/Cyrillic (Windows-1251)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��亳仍仍亳��亠��从舒�� _Win (Windows-1251)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��亳仍仍亳��舒 (_Windows-1251)"
 
 #: src/compose.c:628 src/mainwindow.c:669 src/messageview.c:210
-#, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-_JP)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/亊仗仂仆��从舒�� (ISO-2022-_JP)"
 
 #: src/compose.c:632 src/mainwindow.c:679 src/messageview.c:219
-#, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (_GB2312)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/丕仗��仂��亠仆仆舒�� 从亳��舒亶��从舒�� (_GB2312)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��舒亶��从舒�� ��仗��仂����仆仆舒�� (_GB2312)"
 
 #: src/compose.c:634 src/mainwindow.c:681 src/messageview.c:221
-#, fuzzy
 msgid "/_View/Character _encoding/Simplified Chinese (GBK)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/丕仗��仂��亠仆仆舒�� 从亳��舒亶��从舒�� (_GB2312)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��舒亶��从舒�� ��仗��仂����仆仆舒�� (GBK)"
 
 #: src/compose.c:636 src/mainwindow.c:683 src/messageview.c:223
-#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (_Big5)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/丐��舒亟亳��亳仂仆仆舒�� 从亳��舒亶��从舒�� (_Big5)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��舒亶��从舒�� ����舒亟亳��亳仂仆仆舒�� (_Big5)"
 
 #: src/compose.c:640 src/mainwindow.c:691 src/messageview.c:230
-#, fuzzy
 msgid "/_View/Character _encoding/Korean (EUC-_KR)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��仂��亠亶��从舒�� (EUC-_KR)"
 
 #: src/compose.c:644 src/mainwindow.c:697 src/messageview.c:235
-#, fuzzy
 msgid "/_View/Character _encoding/Thai (TIS-620)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/丐舒亶��从舒�� (TIS-620)"
 
 #: src/compose.c:646 src/mainwindow.c:699 src/messageview.c:237
-#, fuzzy
 msgid "/_View/Character _encoding/Thai (Windows-874)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/丐舒亶��从舒�� (Windows-874)"
 
@@ -1541,14 +1514,12 @@ msgid "/_Tools/PGP _Encrypt"
 msgstr "/��仆��������仄亠仆����/丿亳����仂于舒���� ��仂仂弍��亠仆亳亠 (PGP)"
 
 #: src/compose.c:666
-#, fuzzy
 msgid "/_Tools/_Check spell"
-msgstr "/��仆��������仄亠仆����/����仗仂仍仆亳����"
+msgstr "/��仆��������仄亠仆����/����仂于亠��亳���� 仂����仂亞��舒��亳��"
 
 #: src/compose.c:667
-#, fuzzy
 msgid "/_Tools/_Set spell language"
-msgstr "/��仆��������仄亠仆����/丿舒弍仍仂仆"
+msgstr "/��仆��������仄亠仆����/亊亰��从 亟仍�� 仗��仂于亠��从亳 仂����仂亞��舒��亳亳"
 
 #: src/compose.c:916
 #, c-format
@@ -1602,7 +1573,7 @@ msgid "(No Subject)"
 msgstr "(��亠亰 ��亠仄��)"
 
 #: src/compose.c:2531
-#, fuzzy, c-format
+#, c-format
 msgid "%s - Compose%s"
 msgstr "%s - ��仂亟亞仂��仂于从舒 ��仂仂弍��亠仆亳��%s"
 
@@ -1611,9 +1582,8 @@ msgid "Recipient is not specified."
 msgstr "��仂仍����舒��亠仍�� ��仂仂弍��亠仆亳�� 仆亠 ��从舒亰舒仆."
 
 #: src/compose.c:2654
-#, fuzzy
 msgid "Empty subject"
-msgstr "丐亠仄舒"
+msgstr "丐亠仄舒 仆亠 ��从舒亰舒仆舒"
 
 #: src/compose.c:2655
 msgid "Subject is empty. Send it anyway?"
@@ -1628,8 +1598,8 @@ msgid ""
 "Account for sending mail is not specified.\n"
 "Please select a mail account before sending."
 msgstr ""
-"丕��亠��仆舒�� 亰舒仗亳���� 亟仍�� 仂��仗��舒于从亳 仗仂������ 仆亠 仂仗��亠亟亠仍亠仆舒.\n"
-"��仂亢舒仍��亶����舒, 于��弍亠��亳��亠 亠亠 仗亠��亠亟 仂��仗��舒于从仂亶."
+"丕������仆舒�� 亰舒仗亳���� 亟仍�� 仂��仗��舒于从亳 仗仂������ 仆亠 仂仗��亠亟亠仍亠仆舒.\n"
+"��仂亢舒仍��亶����舒, 于��弍亠��亳��亠 亠�� 仗亠��亠亟 仂��仗��舒于从仂亶."
 
 #: src/compose.c:2748 src/send_message.c:299
 #, c-format
@@ -1643,23 +1613,22 @@ msgstr "����亳弍从舒 ��仂����舒仆亠仆亳�� ��仂仂弍��亠仆亳�� 于 仗舒仗从亠 仂���
 #: src/compose.c:2828
 #, c-format
 msgid "Could not find any key associated with currently selected key id `%s'."
-msgstr "��亠 仆舒亶亟亠仆 从仍�ﾑ�, ��仂仂��于亠������于���ﾑ�亳亶 于��弍��舒仆仆仂仄�� 亳亟亠仆��亳��亳从舒��仂���� '%s'."
+msgstr "��亠 仆舒亶亟亠仆 从仍�ﾑ�, ��仂仂��于亠������于���ﾑ�亳亶 于��弍��舒仆仆仂仄�� 亳亟亠仆��亳��亳从舒��仂���� \"%s\"."
 
 #: src/compose.c:2925
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "Can't convert the character encoding of the message body from %s to %s.\n"
 "\n"
 "Send it as %s anyway?"
 msgstr ""
-"��亠 ��亟舒仍仂���� 仗��亠仂弍��舒亰仂于舒���� 从仂亟亳��仂于从�� ����仂亞仂 ��仂仂弍��亠仆亳��\n"
-"亳亰 %s 于 %s.\n"
-"����亠 ��舒于仆仂 仗仂��仍舒���� 亠亞仂?"
+"��亠 ��亟舒仍仂���� 仗��亠仂弍��舒亰仂于舒���� 从仂亟亳��仂于从�� ����仂亞仂 ��仂仂弍��亠仆亳�� 亳亰 %s 于 %s.\n"
+"\n"
+"����仗��舒于亳���� 亠亞仂 于 从仂亟亳��仂于从亠 %s?"
 
 #: src/compose.c:2931
-#, fuzzy
 msgid "Code conversion error"
-msgstr "����亳弍从舒 仗��亠仂弍��舒亰仂于舒仆亳�� 舒亟��亠��仆仂亶 从仆亳亞亳"
+msgstr "����亳弍从舒 仗��亠仂弍��舒亰仂于舒仆亳�� 从仂亟亳��仂于从亳"
 
 #: src/compose.c:3004
 #, c-format
@@ -1669,10 +1638,14 @@ msgid ""
 "\n"
 "Send it anyway?"
 msgstr ""
+"弌����仂从舒 %d 亟仍亳仆仆亠亠 仄舒从��亳仄舒仍��仆仂 亟仂仗������亳仄仂亶 (998 弍舒亶��).\n"
+"弌仂亟亠��亢亳仄仂亠 ��仂仂弍��亠仆亳�� 仄仂亢亠�� 弍������ 亳��从舒亢亠仆仂 于 仗��仂��亠����亠 亟仂����舒于从亳.\n"
+"\n"
+"����仗��舒于亳���� ��仂仂弍��亠仆亳亠?"
 
 #: src/compose.c:3008
 msgid "Line length limit"
-msgstr ""
+msgstr "弌仍亳��从仂仄 亟仍亳仆仆舒�� ������仂从舒"
 
 #: src/compose.c:3298
 msgid "can't remove the old message\n"
@@ -1704,14 +1677,12 @@ msgid "From:"
 msgstr "����:"
 
 #: src/compose.c:4272
-#, fuzzy
 msgid "PGP Sign"
-msgstr "/��仆��������仄亠仆����/��仂亟仗亳��舒���� ��仂仂弍��亠仆亳亠 (PGP)"
+msgstr "��仂亟仗亳��舒���� PGP"
 
 #: src/compose.c:4275
-#, fuzzy
 msgid "PGP Encrypt"
-msgstr "/��仆��������仄亠仆����/丿亳����仂于舒���� ��仂仂弍��亠仆亳亠 (PGP)"
+msgstr "丿亳����仂于舒���� PGP"
 
 #: src/compose.c:4313 src/compose.c:5391
 msgid "MIME type"
@@ -1771,9 +1742,8 @@ msgid "Signature"
 msgstr "��仂亟仗亳����"
 
 #: src/compose.c:4807
-#, fuzzy
 msgid "Append signature"
-msgstr "������丱��亊 仗仂亟仗亳����"
+msgstr "��仂弍舒于亳���� 仗仂亟仗亳����"
 
 #. editor
 #: src/compose.c:4816 src/prefs_common_dialog.c:1021
@@ -1791,7 +1761,7 @@ msgstr "��亠��亠仆仂�� ������仂从"
 
 #: src/compose.c:4826
 msgid "Wrap all long lines"
-msgstr "������仂��仄舒��亳��仂于舒���� 于��亠 ��仂仂弍��亠仆亳亠"
+msgstr "������仂��仄舒��亳��仂于舒���� 于���� ��仂仂弍��亠仆亳亠"
 
 #: src/compose.c:5287
 msgid "Invalid MIME type."
@@ -1820,61 +1790,56 @@ msgstr "��仄�� ��舒亶仍舒"
 #: src/compose.c:5506
 #, c-format
 msgid "External editor command line is invalid: `%s'\n"
-msgstr "��亠于亠��仆舒�� 从仂仄舒仆亟舒 于��亰仂于舒 于仆亠��仆亠亞仂 ��亠亟舒从��仂��舒: '%s'\n"
+msgstr "��亠于亠��仆舒�� 从仂仄舒仆亟舒 于��亰仂于舒 于仆亠��仆亠亞仂 ��亠亟舒从��仂��舒: \"%s\"\n"
 
 #: src/compose.c:5554
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The external editor is still working.\n"
 "Force terminating the process (pid: %d)?\n"
 msgstr ""
-"��仆亠��仆亳亶 ��亠亟舒从��仂�� 亠��亠 ��舒弍仂��舒亠��.\n"
+"��仆亠��仆亳亶 ��亠亟舒从��仂�� 亠���� ��舒弍仂��舒亠��.\n"
 "��舒于亠����亳���� 仗��仂��亠���� 仗��亳仆��亟亳��亠仍��仆仂?\n"
-"��亟亠仆��亳��亳从舒��仂�� 亞����仗仗�� 仗��仂��亠����仂于: %d"
+"��亟亠仆��亳��亳从舒��仂�� 亞����仗仗�� 仗��仂��亠����仂于: %d\n"
 
 #: src/compose.c:5929 src/compose.c:5934 src/compose.c:5940
 msgid "Can't queue the message."
 msgstr "����亳弍从舒 仗仂����舒仆仂于从亳 于 仂��亠��亠亟��."
 
 #: src/compose.c:6031
-#, fuzzy
 msgid "Select files"
-msgstr "����弍仂�� ��舒亶仍舒"
+msgstr "����弍仂�� ��舒亶仍仂于"
 
 #: src/compose.c:6054
 msgid "Select file"
 msgstr "����弍仂�� ��舒亶仍舒"
 
 #: src/compose.c:6089
-#, fuzzy
 msgid "Save message"
-msgstr "����仗��舒于亳���� ��仂仂弍��亠仆亳亠"
+msgstr "弌仂����舒仆亳���� ��仂仂弍��亠仆亳亠"
 
 #: src/compose.c:6090
-#, fuzzy
 msgid "This message has been modified. Save it to draft folder?"
-msgstr "亅��仂 ��仂仂弍��亠仆亳亠 亳亰仄亠仆亠仆仂. ����从舒亰舒�������� 仂�� 仆亠亞仂?"
+msgstr "亅��仂 ��仂仂弍��亠仆亳亠 亳亰仄亠仆亠仆仂. 弌仂����舒仆亳���� 亠亞仂 于 仗舒仗从亠 ��亠��仆仂于亳从仂于?"
 
 #: src/compose.c:6092
 msgid "Close _without saving"
-msgstr ""
+msgstr "��舒从�������� 弍亠亰 ��仂����舒仆亠仆亳��"
 
 #: src/compose.c:6134
 #, c-format
 msgid "Do you want to apply the template `%s' ?"
-msgstr "����亳仄亠仆亳���� ��舒弍仍仂仆 '%s'?"
+msgstr "����亳仄亠仆亳���� ��舒弍仍仂仆 \"%s\"?"
 
 #: src/compose.c:6136
 msgid "Apply template"
 msgstr "����亳仄亠仆亳���� ��舒弍仍仂仆"
 
 #: src/compose.c:6137
-#, fuzzy
 msgid "_Replace"
 msgstr "��舒仄亠仆亳����"
 
 #: src/compose.c:6137
-#, fuzzy
 msgid "_Insert"
 msgstr "������舒于亳����"
 
@@ -2035,12 +2000,12 @@ msgstr "��亰仄亠仆亳���� 亳仄�� 仗舒仗从亳"
 msgid "Input the new name of folder:"
 msgstr "��于亠亟亳��亠 仆仂于仂亠 亳仄�� 仗舒仗从亳:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��仂于舒�� 仗舒仗从舒"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "��于亠亟亳��亠 亳仄�� 仆仂于仂亶 仗舒仗从亳:"
 
@@ -2201,184 +2166,186 @@ msgid "Overwrite existing file?"
 msgstr "��亠��亠仗亳��舒���� ������亠����于���ﾑ�亳亶 ��舒亶仍?"
 
 #: src/filesel.c:159
-#, fuzzy
 msgid "Select directory"
-msgstr "����弍仂�� 仗舒仗从亳"
+msgstr "����弍仂�� 从舒��舒仍仂亞舒"
 
 #: src/foldersel.c:230
 msgid "Select folder"
 msgstr "����弍仂�� 仗舒仗从亳"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "����仂亟����亳亠"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "����仗��舒于仍亠仆仆��亠"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "����亠��亠亟��"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "��仂��亰亳仆舒"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "丼亠��仆仂于亳从亳"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "��仂于舒����舒仗从舒"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, c-format
 msgid "`%c' can't be included in folder name."
-msgstr "弌亳仄于仂仍 '%c' 仆亠 仄仂亢亠�� 于��仂亟亳���� 于 亳仄�� 仗舒仗从亳."
+msgstr "弌亳仄于仂仍 \"%c\" 仆亠 仄仂亢亠�� 于��仂亟亳���� 于 亳仄�� 仗舒仗从亳."
 
-#: src/foldersel.c:564 src/folderview.c:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
-msgstr "��舒仗从舒 '%s' ��亢亠 ������亠����于��亠��."
+msgstr "��舒仗从舒 \"%s\" ��亢亠 ������亠����于��亠��."
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
-msgstr "��亠 ��亟舒仍仂���� ��仂亰亟舒���� 仗舒仗从�� '%s'."
+msgstr "��亠 ��亟舒仍仂���� ��仂亰亟舒���� 仗舒仗从�� \"%s\"."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/弌仂亰亟舒���� 仆仂于���� 仗舒仗从��..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/��亠��亠亳仄亠仆仂于舒���� 仗舒仗从��..."
 
-#: src/folderview.c:244 src/folderview.c:264
-#, fuzzy
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
-msgstr "/��亠��亠亳仄亠仆仂于舒���� 仗舒仗从��..."
+msgstr "/��亠��亠仄亠����亳���� 仗舒仗从��..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/丕亟舒仍亳���� 仗舒仗从��"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/����亳����亳���� 从仂��亰亳仆��"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/����仂于亠��亳���� 仆仂于��亠 ��仂仂弍��亠仆亳��"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/��亠��亠������仂亳���� 亟亠��亠于仂 仗舒仗仂从"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
-#, fuzzy
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
-msgstr "/��亳亟/��弍仆仂于亳���� ��仗亳��仂从 ��仂仂弍��亠仆亳亶"
+msgstr "/��弍仆仂于亳���� ��仗亳��仂从 ��仂仂弍��亠仆亳亶"
+
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "��仂仄亠��亳���� 从舒从 仗��仂��亳��舒仆仆仂亠"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/��仂亳��从 ��仂仂弍��亠仆亳亶..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
-msgstr ""
+msgstr "/��亰仄亠仆亳���� ����仍仂于亳亠 仗仂亳��从舒..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/��舒亞����亰亳����"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/��仂亟仗亳��从舒 仆舒 亞����仗仗�� 仆仂于仂����亠亶..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/丕亟舒仍亳���� 亞����仗仗�� 仆仂于仂����亠亶"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "弌仂亰亟舒仆亳亠 仂弍仍舒����亳 仗��仂��仄仂����舒 仗舒仗仂从...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "��仂于��亠"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
-msgstr "��亠仗��仂��亳��舒仆仆��亠"
+msgstr "��亠 仗��仂��亳��舒仆仂"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "丕����舒仆仂于从舒 亳仆��仂��仄舒��亳亳 仂 仗舒仗从亠...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "丕����舒仆仂于从舒 亳仆��仂��仄舒��亳亳 仂 仗舒仗从亠..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "��亠��亠������仂亳���� 亟亠��亠于仂 仗舒仗仂从"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "��亠��亠于仂 仗舒仗仂从 弍��亟亠�� 仗亠��亠������仂亠仆仂. ����仂亟仂仍亢亳����?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "��亠��亠������仂亶从舒 亟亠��亠于舒 仗舒仗仂从..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "����亳弍从舒 仗��亳 仗亠��亠������仂亶从亠 亟亠��亠于舒 仗舒仗仂从."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "����仂于亠��从舒 仆仂于���� ��仂仂弍��亠仆亳亶 于仂 于��亠�� 仗舒仗从舒��..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
-msgstr ""
+msgstr "弌仗舒仄"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "��舒仗从舒 %s 于��弍��舒仆舒\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��舒亞����亢舒�ﾑ����� ��仂仂弍��亠仆亳�� 亳亰 %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
-msgstr "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 亰舒亞����亰从亠 ��仂仂弍��亠仆亳亶 亳亰 '%s'."
+msgstr "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 亰舒亞����亰从亠 ��仂仂弍��亠仆亳亶 亳亰 \"%s\"."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2386,105 +2353,105 @@ msgid ""
 msgstr ""
 "��于亠亟亳��亠 亳仄�� 仆仂于仂亶 仗舒仗从亳:\n"
 "(亠��仍亳 于�� ��仂��亳��亠 ��仂亰亟舒���� 仗舒仗从�� 亟仍�� 于仍仂亢亠仆仆���� 仗舒仗仂从,\n"
-" 亟仂弍舒于����亠 '/' 于 从仂仆亠�� 亳仄亠仆亳)"
+" 亟仂弍舒于����亠 \"/\" 于 从仂仆亠�� 亳仄亠仆亳)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
-msgstr "��于亠亟亳��亠 仆仂于仂亠 亳仄�� 亟仍�� '%s':"
+msgstr "��于亠亟亳��亠 仆仂于仂亠 亳仄�� 亟仍�� \"%s\":"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "��亠��亠亳仄亠仆仂于舒���� 仗舒仗从��"
 
-#: src/folderview.c:2221 src/folderview.c:2229
-#, fuzzy, c-format
+#: src/folderview.c:2248 src/folderview.c:2256
+#, c-format
 msgid "Can't rename the folder '%s'."
-msgstr "����亳弍从舒 仗��亳 ��亟舒仍亠仆亳亳 仗舒仗从亳 '%s'."
+msgstr "��亠 ��亟舒仍仂���� 仗亠��亠亳仄亠仆仂于舒���� 仗舒仗从�� \"%s\"."
 
-#: src/folderview.c:2299
-#, fuzzy, c-format
+#: src/folderview.c:2326
+#, c-format
 msgid "Can't move the folder `%s'."
-msgstr "����亳弍从舒 仗��亳 ��亟舒仍亠仆亳亳 仗舒仗从亳 '%s'."
+msgstr "��亠 ��亟舒仍仂���� 仗亠��亠仄亠����亳���� 仗舒仗从�� \"%s\"."
 
-#: src/folderview.c:2365
-#, fuzzy, c-format
+#: src/folderview.c:2392
+#, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
 "The real messages are not deleted."
 msgstr ""
-"丕亟舒仍亳���� 仗仂����仂于��亶 ����亳从 '%s' ?\n"
-"(弌仂仂弍��亠仆亳�� 仆亠 弍��亟���� ��亟舒仍亠仆�� �� 亟亳��从舒)"
+"丕亟舒仍亳���� 仗舒仗从�� 仗仂亳��从舒 \"%s\"?\n"
+"亅��仂 仆亠 仗��亳于亠亟���� 从 ��亟舒仍亠仆亳�� ��仂仂弍��亠仆亳亶."
 
-#: src/folderview.c:2367
-#, fuzzy
+#: src/folderview.c:2394
 msgid "Delete search folder"
-msgstr "丕亟舒仍亳���� 仗舒仗从��"
+msgstr "丕亟舒仍亳���� 仗舒仗从�� 仗仂亳��从舒"
 
-#: src/folderview.c:2372
-#, fuzzy, c-format
+#: src/folderview.c:2399
+#, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
 "Recovery will not be possible.\n"
 "\n"
 "Do you really want to delete?"
 msgstr ""
-"����亠 于仍仂亢亠仆仆��亠 仗舒仗从亳 亳 ��仂仂弍��亠仆亳�� 亳亰 '%s' 弍��亟���� ��亟舒仍亠仆��.\n"
+"����亠 于仍仂亢亠仆仆��亠 仗舒仗从亳 亳 ��仂仂弍��亠仆亳�� 亳亰 \"%s\" 弍��亟���� ��亟舒仍亠仆��\n"
+"弍亠亰 于仂亰仄仂亢仆仂����亳 于仂������舒仆仂于仍亠仆亳��.\n"
+"\n"
 "���� 亟亠亶����于亳��亠仍��仆仂 ��仂��亳��亠 ��亟舒仍亳���� 仗舒仗从��?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
-#, fuzzy, c-format
+#: src/folderview.c:2431 src/folderview.c:2437
+#, c-format
 msgid "Can't remove the folder '%s'."
-msgstr "����亳弍从舒 仗��亳 ��亟舒仍亠仆亳亳 仗舒仗从亳 '%s'."
+msgstr "����亳弍从舒 仗��亳 ��亟舒仍亠仆亳亳 仗舒仗从亳 \"%s\"."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "����亳����从舒 从仂��亰亳仆��"
 
-#: src/folderview.c:2447
-#, fuzzy
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "丕亟舒仍亳���� 于��亠 ��仂仂弍��亠仆亳�� 亳亰 从仂��亰亳仆��?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
 "(The messages are NOT deleted from the disk)"
 msgstr ""
-"丕亟舒仍亳���� 仗仂����仂于��亶 ����亳从 '%s' ?\n"
+"丕亟舒仍亳���� 仗仂����仂于��亶 ����亳从 \"%s\"?\n"
 "(弌仂仂弍��亠仆亳�� 仆亠 弍��亟���� ��亟舒仍亠仆�� �� 亟亳��从舒)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "丕亟舒仍亳���� 仗仂����仂于��亶 ����亳从"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
-msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳���� IMAP4 '%s'?"
+msgstr "丕亟舒仍亳���� ��������仆���� 亰舒仗亳���� IMAP4 \"%s\"?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
-msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳���� IMAP4"
+msgstr "丕亟舒仍亳���� ��������仆���� 亰舒仗亳���� IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
-msgstr "丕亟舒仍亳���� 亞����仗仗�� 仆仂于仂����亠亶 '%s'?"
+msgstr "丕亟舒仍亳���� 亞����仗仗�� 仆仂于仂����亠亶 \"%s\"?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "丕亟舒仍亠仆亳亠 亞����仗仗�� 仆仂于仂����亠亶"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
-msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳���� 仆仂于仂����亠亶 '%s'?"
+msgstr "丕亟舒仍亳���� ��������仆���� 亰舒仗亳���� 仆仂于仂����亠亶 \"%s\"?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
-msgstr "丕亟舒仍亳���� ����亠��仆���� 亰舒仗亳���� 仆仂于仂����亠亶"
+msgstr "丕亟舒仍亳���� ��������仆���� 亰舒仗亳���� 仆仂于仂����亠亶"
 
 #: src/headerview.c:56
 msgid "Newsgroups:"
@@ -2624,9 +2591,9 @@ msgid "Finish"
 msgstr "��舒于亠����亠仆亳亠"
 
 #: src/inc.c:160
-#, fuzzy, c-format
+#, c-format
 msgid "Sylpheed: %d new messages"
-msgstr "��舒于亠����亠仆仂 (仆仂于���� ��仂仂弍��亠仆亳亶: %d)"
+msgstr "Sylpheed (仆仂于���� ��仂仂弍��亠仆亳亶: %d)"
 
 #: src/inc.c:371
 msgid "Retrieving new messages"
@@ -2685,7 +2652,7 @@ msgstr "����亳 仗仂仍����亠仆亳亳 ��仂仂弍��亠仆亳亶 于仂亰仆亳从仍亳 仂��亳弍从
 #: src/inc.c:687
 #, c-format
 msgid "getting new messages of account %s...\n"
-msgstr "仗仂仍����亠仆亳亠 仆仂于���� ��仂仂弍��亠仆亳亶 亟仍�� ����亠��仆仂亶 亰舒仗亳��亳 %s...\n"
+msgstr "仗仂仍����亠仆亳亠 仆仂于���� ��仂仂弍��亠仆亳亶 亟仍�� ��������仆仂亶 亰舒仗亳��亳 %s...\n"
 
 #: src/inc.c:690
 #, c-format
@@ -2700,7 +2667,7 @@ msgstr "弌仂亠亟亳仆亠仆亳亠 �� ��亠��于亠��仂仄 POP3: %s..."
 #: src/inc.c:718
 #, c-format
 msgid "Can't connect to POP3 server: %s:%d\n"
-msgstr "��亠 ��亟舒仍仂���� ��仂亠亟亳仆亠仆亳亠 �� ��亠��于亠��仂仄 POP3: %s:%d\n"
+msgstr "��亠 ��亟舒仍仂���� ��仂亠亟亳仆亳�������� �� ��亠��于亠��仂仄 POP3: %s:%d\n"
 
 #: src/inc.c:797 src/send_message.c:633
 msgid "Authenticating..."
@@ -2744,7 +2711,7 @@ msgstr "��仂仍����亠仆亳亠 ��仂仂弍��亠仆亳�� (%d / %d) (%s / %s)"
 #: src/inc.c:878
 #, c-format
 msgid "Retrieving (%d message(s) (%s) received)"
-msgstr "����亳亠仄 (仗��亳仆����仂 ��仂仂弍��亠仆亳亶: %d (%s))"
+msgstr "����亳��仄 (仗��亳仆����仂 ��仂仂弍��亠仆亳亶: %d (%s))"
 
 #: src/inc.c:1106
 msgid "Connection failed."
@@ -2765,7 +2732,7 @@ msgstr ""
 
 #: src/inc.c:1123
 msgid "No disk space left."
-msgstr "��亠 仂����舒仍仂���� 仄亠����舒 仆舒 亟亳��从亠."
+msgstr "��亠�� 仄亠����舒 仆舒 亟亳��从亠."
 
 #: src/inc.c:1128
 msgid "Can't write file."
@@ -2812,7 +2779,7 @@ msgstr "����亠仄�� ��亠舒仆��舒 亳����亠从仍仂."
 
 #: src/inc.c:1201
 msgid "Incorporation cancelled\n"
-msgstr "����亳亠仄 ��仂仂弍��亠仆亳亶 仗��亠��于舒仆\n"
+msgstr "����亳��仄 ��仂仂弍��亠仆亳亶 仗��亠��于舒仆\n"
 
 #: src/inc.c:1284
 #, c-format
@@ -2843,7 +2810,7 @@ msgstr "����仗仂仍��亰仂于舒仆亳亠: %s [������������丐��]...\n"
 
 #: src/main.c:406
 msgid "  --compose [address]    open composition window"
-msgstr "  --compose [舒亟��亠��]      仂��从�������� 仂从仆仂 仗仂亟亞仂��仂于从亳 ��仂仂弍��亠仆亳��"
+msgstr "  --compose [舒亟��亠��]      仂��从�������� 仂从仆仂 ��仂亰亟舒仆亳�� ��仂仂弍��亠仆亳��"
 
 #: src/main.c:407
 msgid ""
@@ -2852,7 +2819,7 @@ msgid ""
 "                         attached"
 msgstr ""
 "  --attach file1 [file2]...\n"
-"                         仂��从�������� 仂从仆仂 ��仂亰亟舒仆亳�� ��仂仂弍��亠仆亳�� �� 仗��亳��仂亠亟亳仆亠仆仆��仄亳\n"
+"                         仂��从�������� 仂从仆仂 ��仂亰亟舒仆亳�� ��仂仂弍��亠仆亳�� �� 仗��亳��仂亠亟亳仆��仆仆��仄亳\n"
 "                         ��舒亶仍舒仄亳"
 
 #: src/main.c:410
@@ -2862,7 +2829,7 @@ msgstr "  --receive              仗仂仍����亳���� 仆仂于��亠 ��仂仂弍��亠仆亳��"
 #: src/main.c:411
 msgid "  --receive-all          receive new messages of all accounts"
 msgstr ""
-"  --receive-all          仗仂仍����亳���� 仆仂于��亠 ��仂仂弍��亠仆亳�� ��仂 于��亠�� ����亠��仆���� 亰舒仗亳��亠亶"
+"  --receive-all          仗仂仍����亳���� 仆仂于��亠 ��仂仂弍��亠仆亳�� ��仂 于��亠�� ��������仆���� 亰舒仗亳��亠亶"
 
 #: src/main.c:412
 msgid "  --send                 send all queued messages"
@@ -2883,12 +2850,11 @@ msgstr ""
 #: src/main.c:416
 msgid ""
 "  --configdir dirname    specify directory which stores configuration files"
-msgstr ""
+msgstr "  --configdir 从舒��舒仍仂亞    ��从舒亰舒���� 从舒��舒仍仂亞 �� ��舒亶仍舒仄亳 从仂仆��亳亞����舒��亳亳"
 
 #: src/main.c:417
-#, fuzzy
 msgid "  --exit                 exit Sylpheed"
-msgstr "  --debug                ��亠亢亳仄 仂��仍舒亟从亳"
+msgstr "  --exit                 亰舒于亠����亳���� ��舒弍仂���� Sylpheed"
 
 #: src/main.c:418
 msgid "  --debug                debug mode"
@@ -2903,16 +2869,12 @@ msgid "  --version              output version information and exit"
 msgstr "  --version              于��于亠����亳 亳仆��仂��仄舒��亳�� 仂 于亠����亳亳 亳 于��亶��亳"
 
 #: src/main.c:424
-#, fuzzy
 msgid "Press any key..."
-msgstr ""
-"亳仍亳 仆舒亢仄亳��亠 从仍舒于亳���� 'y'.\n"
-"\n"
+msgstr "��舒亢仄亳��亠 仍�ﾐ英��� 从仍舒于亳����..."
 
 #: src/main.c:566
-#, fuzzy
 msgid "Filename encoding"
-msgstr "��仂亟亳��仂于从舒 仂��仗��舒于仍�磳仄���� ��仂仂弍��亠仆亳亶"
+msgstr "��仂亟亳��仂于从舒 亳仄��仆 ��舒亶仍仂于"
 
 #: src/main.c:567
 msgid ""
@@ -2927,6 +2889,16 @@ msgid ""
 "\n"
 "Continue?"
 msgstr ""
+"����弍��舒仆舒 从仂亟亳��仂于从舒, 仂��仍亳��仆舒�� 仂�� UTF-8, 仂亟仆舒从仂 仗亠��亠仄亠仆仆舒�� 仂从����亢亠仆亳�� "
+"G_FILENAME_ENCODING 仆亠 ������舒仆仂于仍亠仆舒.\n"
+"����仍亳 于��弍��舒仆仆舒�� 从仂亟亳��仂于从舒 弍��亟亠�� 亳��仗仂仍��亰仂于舒仆舒 于 亳仄亠仆舒�� ��舒亶仍仂于 亳仍亳 从舒��舒仍仂亞仂于, "
+"��舒从亳亠 亳仄亠仆舒 仆亠 弍��亟���� 仂弍��舒弍舒����于舒�������� 仗��舒于亳仍��仆仂.\n"
+"�� ����仂仄 ��仍����舒亠 仆亠仂弍��仂亟亳仄仂 ������舒仆仂于亳���� ��仍亠亟���ﾑ����� 仗亠��亠仄亠仆仆���� 仂从����亢亠仆亳�� (��仄. "
+"弍仂仍亠亠 仗仂亟��仂弍仆仂亠 仂仗亳��舒仆亳亠 于 ��舒亶仍亠 README):\n"
+"\n"
+"\tG_FILENAME_ENCODING=@locale\n"
+"\n"
+"����仂亟仂仍亢亳����?"
 
 #: src/main.c:623
 msgid "Composing message exists. Really quit?"
@@ -2938,7 +2910,7 @@ msgstr "弌仂仂弍��亠仆亳�� 于 仂��亠��亠亟亳"
 
 #: src/main.c:635
 msgid "Some unsent messages are queued. Exit now?"
-msgstr "�� 仂��亠��亠亟亳 亠������ 仆亠仗仂��仍舒仆仆��亠 ��仂仂弍��亠仆亳��. ������仂亟亳����?"
+msgstr "�� 仂��亠��亠亟亳 亠������ 仆亠仂��仗��舒于仍亠仆仆��亠 ��仂仂弍��亠仆亳��. ������仂亟亳����?"
 
 #: src/main.c:734
 msgid ""
@@ -2954,15 +2926,16 @@ msgid "another Sylpheed is already running.\n"
 msgstr "亟����亞舒�� 从仂仗亳�� Sylpheed ��亢亠 亰舒仗����亠仆舒.\n"
 
 #: src/main.c:1133
-#, fuzzy
 msgid "Migration of configuration"
-msgstr "��舒������仂亶从舒 亟亠亶����于亳亶"
+msgstr "��仄仗仂���� 仗��亠亟��亟����亠亶 从仂仆��亳亞����舒��亳亳"
 
 #: src/main.c:1134
 msgid ""
 "The previous version of configuration found.\n"
 "Do you want to migrate it?"
 msgstr ""
+"��弍仆舒����亢亠仆�� 仆舒������仂亶从亳, ��亟亠仍舒仆仆��亠 于 仗��亠亟��亟����亠亶 于亠����亳亳.\n"
+"����仗仂仍��亰仂于舒���� 亳��?"
 
 #: src/mainwindow.c:490
 msgid "/_File/_Folder"
@@ -2977,9 +2950,8 @@ msgid "/_File/_Folder/_Rename folder..."
 msgstr "/个舒亶仍/��舒仗从舒/��亠��亠亳仄亠仆仂于舒���� 仗舒仗从��..."
 
 #: src/mainwindow.c:494
-#, fuzzy
 msgid "/_File/_Folder/_Move folder..."
-msgstr "/个舒亶仍/��舒仗从舒/��亠��亠亳仄亠仆仂于舒���� 仗舒仗从��..."
+msgstr "/个舒亶仍/��舒仗从舒/��亠��亠仄亠����亳���� 仗舒仗从��..."
 
 #: src/mainwindow.c:495
 msgid "/_File/_Folder/_Delete folder"
@@ -3072,11 +3044,11 @@ msgstr "/��亳亟/��仂从舒亰舒���� 亳仍亳 ��从��������/��舒仆亠仍�� 亳仆��������仄
 
 #: src/mainwindow.c:538
 msgid "/_View/Show or hi_de/_Toolbar/Icon _and text"
-msgstr "/��亳亟/��仂从舒亰舒���� 亳仍亳 ��从��������/��舒仆亠仍�� 亳仆��������仄亠仆��仂于/��亳从��仂亞��舒仄仄�� 亳 ��亠从����"
+msgstr "/��亳亟/��仂从舒亰舒���� 亳仍亳 ��从��������/��舒仆亠仍�� 亳仆��������仄亠仆��仂于/��仆舒��从亳 亳 ��亠从����"
 
 #: src/mainwindow.c:540
 msgid "/_View/Show or hi_de/_Toolbar/_Icon"
-msgstr "/��亳亟/��仂从舒亰舒���� 亳仍亳 ��从��������/��舒仆亠仍�� 亳仆��������仄亠仆��仂于/��亳从��仂亞��舒仄仄��"
+msgstr "/��亳亟/��仂从舒亰舒���� 亳仍亳 ��从��������/��舒仆亠仍�� 亳仆��������仄亠仆��仂于/��仆舒��从亳"
 
 #: src/mainwindow.c:542
 msgid "/_View/Show or hi_de/_Toolbar/_Text"
@@ -3087,9 +3059,8 @@ msgid "/_View/Show or hi_de/_Toolbar/_None"
 msgstr "/��亳亟/��仂从舒亰舒���� 亳仍亳 ��从��������/��舒仆亠仍�� 亳仆��������仄亠仆��仂于/��亠 仗仂从舒亰��于舒����"
 
 #: src/mainwindow.c:546
-#, fuzzy
 msgid "/_View/Show or hi_de/_Search bar"
-msgstr "/��亳亟/��仂从舒亰舒���� 亳仍亳 ��从��������/弌����仂从舒 ��仂����仂�礌亳��"
+msgstr "/��亳亟/��仂从舒亰舒���� 亳仍亳 ��从��������/弌����仂从舒 仗仂亳��从舒"
 
 #: src/mainwindow.c:548
 msgid "/_View/Show or hi_de/Status _bar"
@@ -3100,9 +3071,8 @@ msgid "/_View/Separate f_older tree"
 msgstr "/��亳亟/����亟亠仍��仆仂亠 亟亠��亠于仂 仗舒仗仂从"
 
 #: src/mainwindow.c:552
-#, fuzzy
 msgid "/_View/Separate _message view"
-msgstr "/��亳亟/����亟亠仍��仆舒�� 仂弍仍舒������ 仗��仂��仄仂����舒"
+msgstr "/��亳亟/����亟亠仍��仆仂亠 仂从仆仂 ��仂仂弍��亠仆亳��"
 
 #: src/mainwindow.c:554
 msgid "/_View/_Sort"
@@ -3121,9 +3091,8 @@ msgid "/_View/_Sort/by _date"
 msgstr "/��亳亟/弌仂����亳��仂于从舒/��仂 亟舒��亠"
 
 #: src/mainwindow.c:558
-#, fuzzy
 msgid "/_View/_Sort/by t_hread date"
-msgstr "/��亳亟/弌仂����亳��仂于从舒/��仂 亟舒��亠"
+msgstr "/��亳亟/弌仂����亳��仂于从舒/��仂 亟舒��亠 仂弍����亢亟亠仆亳��"
 
 #: src/mainwindow.c:559
 msgid "/_View/_Sort/by _from"
@@ -3243,42 +3212,34 @@ msgid "/_View/_Go to/Other _folder..."
 msgstr "/��亳亟/��亠��亠亶��亳/�� 亟����亞仂亶 仗舒仗从亠..."
 
 #: src/mainwindow.c:612 src/messageview.c:161
-#, fuzzy
 msgid "/_View/Character _encoding/_Auto detect"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��于��仂仂仗��亠亟亠仍亠仆亳亠"
 
 #: src/mainwindow.c:625 src/messageview.c:174
-#, fuzzy
 msgid "/_View/Character _encoding/Western European (Windows-1252)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/��舒仗舒亟仆仂亠于��仂仗亠亶��从舒�� (ISO-8859-15)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��舒仗舒亟仆仂亠于��仂仗亠亶��从舒�� (Windows-1252)"
 
 #: src/mainwindow.c:671 src/messageview.c:212
-#, fuzzy
 msgid "/_View/Character _encoding/Japanese (ISO-2022-JP-2)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/亊仗仂仆��从舒�� (ISO-2022-JP-2)"
 
 #: src/mainwindow.c:673 src/messageview.c:214
-#, fuzzy
 msgid "/_View/Character _encoding/Japanese (_EUC-JP)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/亊仗仂仆��从舒�� (_EUC-JP)"
 
 #: src/mainwindow.c:675 src/messageview.c:216
-#, fuzzy
 msgid "/_View/Character _encoding/Japanese (_Shift__JIS)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/亊仗仂仆��从舒�� (_Shift__JIS)"
 
 #: src/mainwindow.c:685 src/messageview.c:225
-#, fuzzy
 msgid "/_View/Character _encoding/Traditional Chinese (EUC-_TW)"
-msgstr "/��亳亟/��仂亟亳��仂于从舒/丐��舒亟亳��亳仂仆仆舒�� 从亳��舒亶��从舒�� (EUC-_TW)"
+msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��舒亶��从舒�� ����舒亟亳��亳仂仆仆舒�� (EUC-_TW)"
 
 #: src/mainwindow.c:687 src/messageview.c:227
-#, fuzzy
 msgid "/_View/Character _encoding/Chinese (ISO-2022-_CN)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��亳��舒亶��从舒�� (ISO-2022-_CN)"
 
 #: src/mainwindow.c:693 src/messageview.c:232
-#, fuzzy
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/��亳亟/��仂亟亳��仂于从舒/��仂��亠亶��从舒�� (ISO-2022-KR)"
 
@@ -3291,7 +3252,6 @@ msgid "/_View/Mess_age source"
 msgstr "/��亳亟/��仂从舒亰舒���� 亳����仂亟仆��亶 ��亠从����"
 
 #: src/mainwindow.c:708 src/messageview.c:245
-#, fuzzy
 msgid "/_View/Show all _headers"
 msgstr "/��亳亟/��仂从舒亰舒���� 于��亠 亰舒亞仂仍仂于从亳"
 
@@ -3309,11 +3269,11 @@ msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����"
 
 #: src/mainwindow.c:714
 msgid "/_Message/Recei_ve/Get from _current account"
-msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/��仂仍����亳���� �� ��亠从����亠亶 ����亠��仆仂亶 亰舒仗亳��亳"
+msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/��仂仍����亳���� �� ��亠从����亠亶 ��������仆仂亶 亰舒仗亳��亳"
 
 #: src/mainwindow.c:716
 msgid "/_Message/Recei_ve/Get from _all accounts"
-msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/��仂仍����亳���� ��仂 于��亠�� ����亠��仆���� 亰舒仗亳��亠亶"
+msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/��仂仍����亳���� ��仂 于��亠�� ��������仆���� 亰舒仗亳��亠亶"
 
 #: src/mainwindow.c:718
 msgid "/_Message/Recei_ve/Cancel receivin_g"
@@ -3403,9 +3363,8 @@ msgid "/_Message/_Mark/Mark as rea_d"
 msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/��仂仄亠��亳���� 从舒从 仗��仂��亳��舒仆仆仂亠"
 
 #: src/mainwindow.c:747
-#, fuzzy
 msgid "/_Message/_Mark/Mark _thread as read"
-msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/��仂仄亠��亳���� 从舒从 仗��仂��亳��舒仆仆仂亠"
+msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/��仂仄亠��亳���� 仂弍����亢亟亠仆亳亠 从舒从 仗��仂��亳��舒仆仆仂亠"
 
 #: src/mainwindow.c:749
 msgid "/_Message/_Mark/Mark all _read"
@@ -3416,20 +3375,18 @@ msgid "/_Message/_Delete"
 msgstr "/弌仂仂弍��亠仆亳亠/丕亟舒仍亳����"
 
 #: src/mainwindow.c:753
-#, fuzzy
 msgid "/_Message/Set as _junk mail"
-msgstr "/弌仂仂弍��亠仆亳亠/����仄亠��亳����/弌仆������ 仂��仄亠��从��"
+msgstr "/弌仂仂弍��亠仆亳亠/��仂仄亠��亳���� 从舒从 ��仗舒仄"
 
 #: src/mainwindow.c:754
 msgid "/_Message/Set as not j_unk mail"
-msgstr ""
+msgstr "/弌仂仂弍��亠仆亳亠/��仂仄亠��亳���� 从舒从 仆亠 ��仗舒仄"
 
 #: src/mainwindow.c:756 src/messageview.c:265
 msgid "/_Message/Re-_edit"
 msgstr "/弌仂仂弍��亠仆亳亠/��亰仄亠仆亳����"
 
 #: src/mainwindow.c:760
-#, fuzzy
 msgid "/_Tools/Add sender to address boo_k..."
 msgstr "/��仆��������仄亠仆����/��仂弍舒于亳���� 仂��仗��舒于亳��亠仍�� 于 舒亟��亠��仆���� 从仆亳亞��"
 
@@ -3462,14 +3419,12 @@ msgid "/_Tools/_Create filter rule/by _Subject"
 msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 ��亠仄亠"
 
 #: src/mainwindow.c:777
-#, fuzzy
 msgid "/_Tools/Filter _junk mails in folder"
-msgstr "/��仆��������仄亠仆����/������亳仍������仂于舒���� 于��亠 ��仂仂弍��亠仆亳�� 于 仗舒仗从亠"
+msgstr "/��仆��������仄亠仆����/������亳仍������仂于舒���� ��仗舒仄 于 仗舒仗从亠"
 
 #: src/mainwindow.c:779
-#, fuzzy
 msgid "/_Tools/Filter junk _mails in selected messages"
-msgstr "/��仆��������仄亠仆����/������亳仍������仂于舒���� 于��弍��舒仆仆��亠 ��仂仂弍��亠仆亳��"
+msgstr "/��仆��������仄亠仆����/������亳仍������仂于舒���� ��仗舒仄 于 于��弍��舒仆仆���� ��仂仂弍��亠仆亳����"
 
 #: src/mainwindow.c:786
 msgid "/_Tools/Delete du_plicated messages"
@@ -3509,19 +3464,19 @@ msgstr "/��舒������仂亶从舒/---"
 
 #: src/mainwindow.c:803
 msgid "/_Configuration/_Preferences for current account..."
-msgstr "/��舒������仂亶从舒/��舒������仂亶从舒 ��亠从����亠亶 ����亠��仆仂亶 亰舒仗亳��亳... "
+msgstr "/��舒������仂亶从舒/��舒������仂亶从舒 ��亠从����亠亶 ��������仆仂亶 亰舒仗亳��亳... "
 
 #: src/mainwindow.c:805
 msgid "/_Configuration/Create _new account..."
-msgstr "/��舒������仂亶从舒/弌仂亰亟舒���� 仆仂于���� ����亠��仆���� 亰舒仗亳����..."
+msgstr "/��舒������仂亶从舒/弌仂亰亟舒���� 仆仂于���� ��������仆���� 亰舒仗亳����..."
 
 #: src/mainwindow.c:807
 msgid "/_Configuration/_Edit accounts..."
-msgstr "/��舒������仂亶从舒/��亠亟舒从��亳��仂于舒仆亳亠 ����亠��仆���� 亰舒仗亳��亠亶..."
+msgstr "/��舒������仂亶从舒/��亠亟舒从��亳��仂于舒仆亳亠 ��������仆���� 亰舒仗亳��亠亶..."
 
 #: src/mainwindow.c:809
 msgid "/_Configuration/C_hange current account"
-msgstr "/��舒������仂亶从舒/��亠��亠从仍�ﾑ�亳���� ��亠从�������� ����亠��仆���� 亰舒仗亳����"
+msgstr "/��舒������仂亶从舒/��亠��亠从仍�ﾑ�亳���� ��亠从�������� ��������仆���� 亰舒仗亳����"
 
 #: src/mainwindow.c:813
 msgid "/_Help/_Manual"
@@ -3560,9 +3515,8 @@ msgid "/_Help/_FAQ/_Italian"
 msgstr "/弌仗��舒于从舒/FAQ/����舒仍���礌��从亳亶"
 
 #: src/mainwindow.c:822
-#, fuzzy
 msgid "/_Help/_Command line options"
-msgstr "��亠 ��从舒亰舒仆舒 从仂仄舒仆亟仆舒�� ������仂从舒."
+msgstr "/弌仗��舒于从舒/��舒��舒仄亠������ 从仂仄舒仆亟仆仂亶 ������仂从亳"
 
 #: src/mainwindow.c:823
 msgid "/_Help/---"
@@ -3608,7 +3562,6 @@ msgid "Empty all trash"
 msgstr "����亳����亳���� 于��亠 从仂��亰亳仆��"
 
 #: src/mainwindow.c:1655
-#, fuzzy
 msgid "Delete all messages in trash folders?"
 msgstr "丕亟舒仍亳���� 于��亠 ��仂仂弍��亠仆亳�� 亳亰 从仂��亰亳仆��?"
 
@@ -3617,7 +3570,6 @@ msgid "Add mailbox"
 msgstr "��仂弍舒于亳���� 仗仂����仂于��亶 ����亳从"
 
 #: src/mainwindow.c:1684
-#, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
 "If the existing mailbox is specified, it will be\n"
@@ -3630,7 +3582,7 @@ msgstr ""
 #: src/mainwindow.c:1690 src/setup.c:49
 #, c-format
 msgid "The mailbox `%s' already exists."
-msgstr "��仂����仂于��亶 ����亳从 '%s' ��亢亠 ������亠����于��亠��."
+msgstr "��仂����仂于��亶 ����亳从 \"%s\" ��亢亠 ������亠����于��亠��."
 
 #: src/mainwindow.c:1695 src/setup.c:56
 msgid "Mailbox"
@@ -3643,8 +3595,8 @@ msgid ""
 "there."
 msgstr ""
 "����亳弍从舒 仗��亳 ��仂亰亟舒仆亳亳 仗仂����仂于仂亞仂 ����亳从舒.\n"
-"��仂亢亠�� 弍������, 仆亠从仂��仂����亠 ��舒亶仍�� ��亢亠 ������亠����于���ﾑ�, 亳仍亳 于�� 仆亠 亳仄亠亠��亠 仗��舒于 仆舒 亰舒仗亳���� "
-"于 从舒��舒仍仂亞亠."
+"��仂亰仄仂亢仆仂, 仆亠从仂��仂����亠 ��舒亶仍�� ��亢亠 ������亠����于���ﾑ�, 亳仍亳 于�� 仆亠 亳仄亠亠��亠 仗��舒于 仆舒 亰舒仗亳���� 于 "
+"从舒��舒仍仂亞."
 
 #: src/mainwindow.c:2123
 msgid "Sylpheed - Folder View"
@@ -3696,11 +3648,11 @@ msgstr "����亳仆������ 于��亠"
 
 #: src/mainwindow.c:2349
 msgid "Incorporate new mail of all accounts"
-msgstr "��仂仍����亳���� ��仂仂弍��亠仆亳�� ��仂 于��亠�� ����亠��仆���� 亰舒仗亳��亠亶"
+msgstr "��仂仍����亳���� ��仂仂弍��亠仆亳�� ��仂 于��亠�� ��������仆���� 亰舒仗亳��亠亶"
 
 #: src/mainwindow.c:2360
 msgid "Send queued message(s)"
-msgstr "��仂��仍舒���� ��仂仂弍��亠仆亳�� 亳亰 仂��亠��亠亟亳"
+msgstr "����仗��舒于亳���� ��仂仂弍��亠仆亳�� 亳亰 仂��亠��亠亟亳"
 
 #: src/mainwindow.c:2370 src/prefs_account_dialog.c:530
 #: src/prefs_common_dialog.c:661 src/prefs_folder_item.c:140
@@ -3740,9 +3692,8 @@ msgid "Delete the message"
 msgstr "丕亟舒仍亳���� ��仂仂弍��亠仆亳亠"
 
 #: src/mainwindow.c:2436
-#, fuzzy
 msgid "Set as junk mail"
-msgstr "��仂 ��仄仂仍��舒仆亳��"
+msgstr "��仂仄亠��亳���� 从舒从 ��仗舒仄"
 
 #: src/mainwindow.c:2445
 msgid "Execute"
@@ -3767,20 +3718,20 @@ msgstr "��弍��亳亠 仆舒������仂亶从亳"
 #: src/mainwindow.c:2477 src/prefs_folder_item.c:289
 #: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
-msgstr "丕��亠��仆舒�� 亰舒仗亳����"
+msgstr "丕������仆舒�� 亰舒仗亳����"
 
 #: src/mainwindow.c:2478
 msgid "Account setting"
-msgstr "��舒������仂亶从舒 ����亠��仆仂亶 亰舒仗亳��亳"
+msgstr "��舒������仂亶从舒 ��������仆仂亶 亰舒仗亳��亳"
 
 #: src/mainwindow.c:2650
 msgid "You are offline. Click the icon to go online."
 msgstr ""
-"���� ��舒弍仂��舒亠��亠 于 舒于��仂仆仂仄仆仂仄 ��亠亢亳仄亠. 乂亠仍从仆亳��亠 仗仂 亰仆舒��从��, ����仂弍�� 仗仂亟从仍�ﾑ�亳��������."
+"���� ��舒弍仂��舒亠��亠 于 舒于��仂仆仂仄仆仂仄 ��亠亢亳仄亠. 乂��仍从仆亳��亠 仗仂 亰仆舒��从��, ����仂弍�� 仗仂亟从仍�ﾑ�亳��������."
 
 #: src/mainwindow.c:2661
 msgid "You are online. Click the icon to go offline."
-msgstr "���� 仗仂亟从仍�ﾑ�亠仆��. 乂亠仍从仆亳��亠 仗仂 亰仆舒��从��, ����仂弍�� ��舒弍仂��舒���� 舒于��仂仆仂仄仆仂."
+msgstr "���� 仗仂亟从仍�ﾑ�亠仆��. 乂��仍从仆亳��亠 仗仂 亰仆舒��从��, ����仂弍�� ��舒弍仂��舒���� 舒于��仂仆仂仄仆仂."
 
 #: src/mainwindow.c:2920
 msgid "Exit"
@@ -3791,14 +3742,12 @@ msgid "Exit this program?"
 msgstr "����亶��亳 亳亰 仗��仂亞��舒仄仄��?"
 
 #: src/mainwindow.c:3538
-#, fuzzy
 msgid "Command line options"
-msgstr "��亠 ��从舒亰舒仆舒 从仂仄舒仆亟仆舒�� ������仂从舒."
+msgstr "��舒��舒仄亠������ 从仂仄舒仆亟仆仂亶 ������仂从亳"
 
 #: src/mainwindow.c:3551
-#, fuzzy
 msgid "Usage: sylpheed [OPTION]..."
-msgstr "����仗仂仍��亰仂于舒仆亳亠: %s [������������丐��]...\n"
+msgstr "����仗仂仍��亰仂于舒仆亳亠: sylpheed [������������丐��]..."
 
 #: src/mainwindow.c:3559
 msgid ""
@@ -3815,6 +3764,18 @@ msgid ""
 "--help\n"
 "--version"
 msgstr ""
+"--compose [舒亟��亠��]\n"
+"--attach ��舒亶仍1 [��舒亶仍2]...\n"
+"--receive\n"
+"--receive-all\n"
+"--send\n"
+"--status [仗舒仗从舒]...\n"
+"--status-full [仗舒仗从舒]...\n"
+"--configdir 从舒��舒仍仂亞\n"
+"--exit\n"
+"--debug\n"
+"--help\n"
+"--version"
 
 #: src/mainwindow.c:3575
 msgid ""
@@ -3831,6 +3792,18 @@ msgid ""
 "display this help and exit\n"
 "output version information and exit"
 msgstr ""
+"仂��从�������� 仂从仆仂 ��仂亰亟舒仆亳�� ��仂仂弍��亠仆亳��\n"
+"仂��从�������� 仂从仆仂 ��仂亰亟舒仆亳�� ��仂仂弍��亠仆亳�� 亳 仗��亳��仂亠亟亳仆亳���� ��从舒亰舒仆仆��亠 ��舒亶仍��\n"
+"仗仂仍����亳���� 仆仂于��亠 ��仂仂弍��亠仆亳��\n"
+"仗仂仍����亳���� 仆仂于��亠 ��仂仂弍��亠仆亳�� ��仂 于��亠�� ��������仆���� 亰舒仗亳��亠亶\n"
+"仂��仗��舒于亳���� 于��亠 ��仂仂弍��亠仆亳�� 亳亰 仂��亠��亠亟亳\n"
+"于��于亠����亳 仂弍��亠亠 ��亳��仍仂 ��仂仂弍��亠仆亳亶 于 仗舒仗从舒��\n"
+"于��于亠����亳 仗仂仍仆仂亠 ��仂����仂�礌亳亠 仗舒仗仂从\n"
+"��从舒亰舒���� 从舒��舒仍仂亞 �� ��舒亶仍舒仄亳 从仂仆��亳亞����舒��亳亳\n"
+"亰舒于亠����亳���� ��舒弍仂���� Sylpheed\n"
+"��亠亢亳仄 仂��仍舒亟从亳\n"
+"仂��仂弍��舒亰亳���� ����仂 ��仂仂弍��亠仆亳亠 亳 于��亶��亳\n"
+"于��于亠����亳 亳仆��仂��仄舒��亳�� 仂 于亠����亳亳 亳 于��亶��亳"
 
 #: src/message_search.c:120
 msgid "Find in current message"
@@ -3883,21 +3856,20 @@ msgstr "��仍仂亢亠仆亳��"
 
 #: src/messageview.c:381
 msgid "Message View - Sylpheed"
-msgstr ""
+msgstr "��从仆仂 ��仂仂弍��亠仆亳�� - Sylpheed"
 
 #: src/messageview.c:700 src/summaryview.c:3475
 #, c-format
 msgid "Can't save the file `%s'."
-msgstr "����亳弍从舒 仗��亳 ��仂����舒仆亠仆亳亳 ��舒亶仍舒 '%s'."
+msgstr "����亳弍从舒 仗��亳 ��仂����舒仆亠仆亳亳 ��舒亶仍舒 \"%s\"."
 
 #: src/messageview.c:758 src/summaryview.c:3498
 msgid "The message will be printed with the following command:"
-msgstr ""
+msgstr "弌仂仂弍��亠仆亳亠 弍��亟亠�� 仆舒仗亠��舒��舒仆仂 �� 仗仂仄仂������ ��仍亠亟���ﾑ�亠亶 从仂仄舒仆亟��:"
 
 #: src/messageview.c:759 src/summaryview.c:3499
-#, fuzzy
 msgid "(Default print command)"
-msgstr "����仗仂仍仆亳���� 从仂仄舒仆亟��"
+msgstr "(��仂仄舒仆亟舒 仗亠��舒��亳 仗仂 ��仄仂仍��舒仆亳��)"
 
 #: src/messageview.c:761 src/prefs_common_dialog.c:2334 src/summaryview.c:3501
 msgid "Print"
@@ -3910,7 +3882,7 @@ msgid ""
 "`%s'"
 msgstr ""
 "��亠仗��舒于亳仍��仆舒�� 从仂仄舒仆亟舒 仗亠��舒��亳:\n"
-"'%s'"
+"\"%s\""
 
 #: src/mimeview.c:128
 msgid "/_Open"
@@ -3929,9 +3901,8 @@ msgid "/_Save as..."
 msgstr "/弌仂����舒仆亳���� 从舒从..."
 
 #: src/mimeview.c:132
-#, fuzzy
 msgid "/Save _all..."
-msgstr "/弌仂����舒仆亳���� 从舒从..."
+msgstr "/弌仂����舒仆亳���� 于��亠..."
 
 #: src/mimeview.c:135
 msgid "/_Check signature"
@@ -3951,34 +3922,31 @@ msgstr "����弍亠��亳��亠 \"����仂于亠��亳���� 仗仂亟仗亳����\" 亟仍�� 仗��仂于亠
 
 #: src/mimeview.c:623
 msgid "Select an action for the attached file:\n"
-msgstr ""
+msgstr "����弍亠��亳��亠 亟亠亶����于亳亠 亟仍�� 于仍仂亢亠仆仆仂亞仂 ��舒亶仍舒:\n"
 
 #: src/mimeview.c:645
-#, fuzzy
 msgid "Open _with..."
-msgstr "/����从�������� �� 仗仂仄仂������..."
+msgstr "����从�������� �� 仗仂仄仂������..."
 
 #: src/mimeview.c:649
-#, fuzzy
 msgid "_Display as text"
-msgstr "/��仂从舒亰舒���� 从舒从 ��亠从����"
+msgstr "��仂从舒亰舒���� 从舒从 ��亠从����"
 
 #: src/mimeview.c:653
-#, fuzzy
 msgid "_Save as..."
-msgstr "/弌仂����舒仆亳���� 从舒从..."
+msgstr "弌仂����舒仆亳���� 从舒从..."
 
 #: src/mimeview.c:699
-#, fuzzy
 msgid ""
 "This signature has not been checked yet.\n"
 "\n"
-msgstr "亅��舒 仗仂亟仗亳���� 亠��亠 仆亠 弍��仍舒 仗��仂于亠��亠仆舒.\n"
+msgstr ""
+"亅��舒 仗仂亟仗亳���� 亠���� 仆亠 弍��仍舒 仗��仂于亠��亠仆舒.\n"
+"\n"
 
 #: src/mimeview.c:704
-#, fuzzy
 msgid "_Check signature"
-msgstr "/����仂于亠��亳���� 仗仂亟仗亳����"
+msgstr "����仂于亠��亳���� 仗仂亟仗亳����"
 
 #: src/mimeview.c:975 src/mimeview.c:1042 src/mimeview.c:1075
 #: src/mimeview.c:1098
@@ -3986,9 +3954,8 @@ msgid "Can't save the part of multipart message."
 msgstr "����亳弍从舒 仗��亳 ��仂����舒仆亠仆亳亳 仂亟仆仂亞仂 亳亰 从仂仄仗仂仆亠仆��仂于 ��仂仂弍��亠仆亳��."
 
 #: src/mimeview.c:1055
-#, fuzzy
 msgid "Can't save the attachments."
-msgstr "����亳弍从舒 仗��亳 ��仂����舒仆亠仆亳亳 ��舒亶仍舒 '%s'."
+msgstr "����亳弍从舒 仗��亳 ��仂����舒仆亠仆亳亳 于仍仂亢亠仆亳亶."
 
 #: src/mimeview.c:1108
 msgid "Open with"
@@ -4001,11 +3968,11 @@ msgid ""
 "(`%s' will be replaced with file name)"
 msgstr ""
 "��于亠亟亳��亠 从仂仄舒仆亟�� 仂��从������亳�� ��舒亶仍舒:\n"
-"('%s' 弍��亟亠�� 亰舒仄亠仆亠仆仂 仆舒 亳仄�� ��舒亶仍舒)"
+"(\"%s\" 弍��亟亠�� 亰舒仄亠仆亠仆仂 仆舒 亳仄�� ��舒亶仍舒)"
 
 #: src/mimeview.c:1140
 msgid "Opening executable file"
-msgstr ""
+msgstr "����从������亳亠 亳��仗仂仍仆�磳仄仂亞仂 ��舒亶仍舒"
 
 #: src/mimeview.c:1141
 msgid ""
@@ -4014,6 +3981,10 @@ msgid ""
 "If you want to launch it, save it to somewhere and make sure it is not an "
 "virus or something like a malicious program."
 msgstr ""
+"亅��仂 亳��仗仂仍仆�磳仄��亶 ��舒亶仍. ����从������亳亠 亳��仗仂仍仆�磳仄���� ��舒亶仍仂于 亰舒仗��亠��亠仆仂 仗仂 ��仂仂弍��舒亢亠仆亳�礆 "
+"弍亠亰仂仗舒��仆仂����亳.\n"
+"����仍亳 于�� 于���� 亢亠 ��仂��亳��亠 亰舒仗������亳���� ����仂�� ��舒亶仍, ��仂����舒仆亳��亠 亠亞仂 仆舒 亟亳��从亠 亳 "
+"��弍亠亟亳��亠����, ����仂 ��舒亶仍 仆亠 ��仂亟亠��亢亳�� 于亳������仂于 亳 亟����亞亳�� 仂仗舒��仆���� 仗��仂亞��舒仄仄."
 
 #: src/passphrase.c:96
 msgid "Passphrase"
@@ -4046,28 +4017,28 @@ msgstr ""
 
 #: src/prefs_account_dialog.c:426
 msgid "Opening account preferences window...\n"
-msgstr "����从������亳亠 仂从仆舒 仆舒������仂亠从 ����亠��仆仂亶 亰舒仗亳��亳...\n"
+msgstr "����从������亳亠 仂从仆舒 仆舒������仂亠从 ��������仆仂亶 亰舒仗亳��亳...\n"
 
 #: src/prefs_account_dialog.c:459
 #, c-format
 msgid "Account%d"
-msgstr "丕��亠��仆舒�� 亰舒仗亳���� %d"
+msgstr "丕������仆舒�� 亰舒仗亳���� %d"
 
 #: src/prefs_account_dialog.c:478
 msgid "Preferences for new account"
-msgstr "��舒������仂亶从亳 仆仂于仂亶 ����亠��仆仂亶 亰舒仗亳��亳"
+msgstr "��舒������仂亶从亳 仆仂于仂亶 ��������仆仂亶 亰舒仗亳��亳"
 
 #: src/prefs_account_dialog.c:483
 msgid "Account preferences"
-msgstr "��舒������仂亶从亳 ����亠��仆仂亶 亰舒仗亳��亳"
+msgstr "��舒������仂亶从亳 ��������仆仂亶 亰舒仗亳��亳"
 
 #: src/prefs_account_dialog.c:506
 msgid "Creating account preferences window...\n"
-msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仆舒������仂亠从 ����亠��仆仂亶 亰舒仗亳��亳...\n"
+msgstr "弌仂亰亟舒仆亳亠 仂从仆舒 仆舒������仂亠从 ��������仆仂亶 亰舒仗亳��亳...\n"
 
 #: src/prefs_account_dialog.c:526 src/prefs_common_dialog.c:657
 msgid "Receive"
-msgstr "����亳亠仄"
+msgstr "����亳��仄"
 
 #: src/prefs_account_dialog.c:533 src/prefs_common_dialog.c:668
 msgid "Privacy"
@@ -4079,11 +4050,11 @@ msgstr "SSL"
 
 #: src/prefs_account_dialog.c:540 src/prefs_common_dialog.c:2135
 msgid "Advanced"
-msgstr "��仂仗仂仍仆亳��亠仍��仆��亠"
+msgstr "��仂仗仂仍仆亳��亠仍��仆仂"
 
 #: src/prefs_account_dialog.c:589
 msgid "Name of this account"
-msgstr "��仄�� ����亠��仆仂亶 亰舒仗亳��亳"
+msgstr "��仄�� ��������仆仂亶 亰舒仗亳��亳"
 
 #: src/prefs_account_dialog.c:598
 msgid "Set as default"
@@ -4137,15 +4108,15 @@ msgstr "弌亠��于亠�� 仆仂于仂����亠亶"
 
 #: src/prefs_account_dialog.c:732
 msgid "Server for receiving"
-msgstr "弌亠��于亠�� 亟仍�� 仗��亳亠仄舒"
+msgstr "弌亠��于亠�� 亟仍�� 仗��亳��仄舒"
 
 #: src/prefs_account_dialog.c:738
 msgid "SMTP server (send)"
-msgstr "弌亠��于亠�� SMTP (仂��仗��舒于从舒)"
+msgstr "弌亠��于亠�� SMTP (亟仍�� 仂��仗��舒于从亳)"
 
 #: src/prefs_account_dialog.c:745 src/prefs_account_dialog.c:1128
 msgid "User ID"
-msgstr "ID 仗仂仍��亰仂于舒��亠仍��"
+msgstr "��仄�� 仗仂仍��亰仂于舒��亠仍��"
 
 #: src/prefs_account_dialog.c:751 src/prefs_account_dialog.c:1137
 msgid "Password"
@@ -4157,7 +4128,7 @@ msgstr "����仗仂仍��亰仂于舒���� 弍亠亰仂仗舒��仆���� 舒����亠仆��亳��亳从舒��亳
 
 #: src/prefs_account_dialog.c:835
 msgid "Remove messages on server when received"
-msgstr "丕亟舒仍������ ��仂仂弍��亠仆亳�� �� ��亠��于亠��舒 仗仂��仍亠 仗��亳亠仄舒"
+msgstr "丕亟舒仍������ ��仂仂弍��亠仆亳�� �� ��亠��于亠��舒 仗仂��仍亠 仗��亳��仄舒"
 
 #: src/prefs_account_dialog.c:846
 msgid "Remove after"
@@ -4168,9 +4139,8 @@ msgid "days"
 msgstr "亟仆亠亶"
 
 #: src/prefs_account_dialog.c:872
-#, fuzzy
 msgid "0 days: remove immediately"
-msgstr "(0 亟仆亠亶: ��亟舒仍亳���� 仆亠仄亠亟仍亠仆仆仂)"
+msgstr "0 亟仆亠亶: ��亟舒仍亳���� 仆亠仄亠亟仍亠仆仆仂"
 
 #: src/prefs_account_dialog.c:882
 msgid "Download all messages on server"
@@ -4178,25 +4148,24 @@ msgstr "����亳仆亳仄舒���� 于��亠 ��仂仂弍��亠仆亳�� �� ��亠��于亠��舒"
 
 #: src/prefs_account_dialog.c:888
 msgid "Receive size limit"
-msgstr "��亞��舒仆亳��亳���� ��舒亰仄亠�� 仗��亳仆亳仄舒亠仄���� ��仂仂弍��亠仆亳亶"
+msgstr "����亳仆亳仄舒���� ��仂仍��从仂 ��仂仂弍��亠仆亳�� ��舒亰仄亠��仂仄 仆亠 弍仂仍亠亠"
 
 #: src/prefs_account_dialog.c:895 src/prefs_filter_edit.c:574
 #: src/prefs_filter_edit.c:1003
 msgid "KB"
-msgstr "从弍"
+msgstr "����"
 
 #: src/prefs_account_dialog.c:902
 msgid "Filter messages on receiving"
-msgstr "个亳仍������仂于舒���� ��仂仂弍��亠仆亳�� 仗��亳 仗��亳亠仄亠"
+msgstr "个亳仍������仂于舒���� ��仂仂弍��亠仆亳�� 仗��亳 仗��亳��仄亠"
 
 #: src/prefs_account_dialog.c:910
 msgid "Default inbox"
 msgstr "��舒仗从舒 亟仍�� 于��仂亟����亳�� ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_account_dialog.c:930
-#, fuzzy
 msgid "Unfiltered messages will be stored in this folder."
-msgstr "(��亠仂����亳仍������仂于舒仆仆��亠 ��仂仂弍��亠仆亳�� 弍��亟���� ��仂����舒仆亠仆�� 于 ����仂亶 仗舒仗从亠)"
+msgstr "��亠仂����亳仍������仂于舒仆仆��亠 ��仂仂弍��亠仆亳�� 弍��亟���� ��仂����舒仆亠仆�� 于 ����仂亶 仗舒仗从亠."
 
 #: src/prefs_account_dialog.c:943 src/prefs_account_dialog.c:1098
 msgid "Authentication method"
@@ -4208,29 +4177,24 @@ msgid "Automatic"
 msgstr "��于��仂仄舒��亳��亠��从亳"
 
 #: src/prefs_account_dialog.c:960
-#, fuzzy
 msgid "Only check INBOX on receiving"
-msgstr "丐仂仍��从仂 仗��亳 ������仆仂仄 亰舒仗����从亠 仗��亳亠仄舒"
+msgstr "����仂于亠�������� ��仂仍��从仂 仗舒仗从�� 于��仂亟����亳�� ��仂仂弍��亠仆亳亶 (INBOX) 仗��亳 仗��亳��仄亠"
 
 #: src/prefs_account_dialog.c:962
 msgid "News"
 msgstr "��仂于仂����亳"
 
 #: src/prefs_account_dialog.c:974
-#, fuzzy
 msgid "Maximum number of articles to download"
-msgstr ""
-"��舒亳弍仂仍����亠亠 ��亳��仍仂 ����舒��亠亶 亟仍�� 亰舒亞����亰从亳\n"
-"(仆亠 仂亞��舒仆亳��亠仆仂, 亠��仍亳 ��从舒亰舒仆 0)"
+msgstr "��舒亳弍仂仍����亠亠 ��亳��仍仂 ����舒��亠亶 亟仍�� 亰舒亞����亰从亳"
 
 #: src/prefs_account_dialog.c:991
-#, fuzzy
 msgid "No limit if 0 is specified."
-msgstr "��仂仍����舒��亠仍�� ��仂仂弍��亠仆亳�� 仆亠 ��从舒亰舒仆."
+msgstr "��亠 仂亞��舒仆亳��亠仆仂, 亠��仍亳 ��从舒亰舒仆 0."
 
 #: src/prefs_account_dialog.c:995
 msgid "`Get all' checks for new messages on this account"
-msgstr "����仂于亠�������� 仗仂 从仂仄舒仆亟亠 '��仂仍����亳���� 于��亠'"
+msgstr "����仂于亠�������� 仗仂 从仂仄舒仆亟亠 \"��仂仍����亳���� 于��亠\""
 
 #: src/prefs_account_dialog.c:1048 src/prefs_customheader.c:186
 msgid "Header"
@@ -4262,13 +4226,12 @@ msgid "SMTP Authentication (SMTP AUTH)"
 msgstr "������亠仆��亳��亳从舒��亳�� SMTP (SMTP AUTH)"
 
 #: src/prefs_account_dialog.c:1159
-#, fuzzy
 msgid ""
 "If you leave these entries empty, the same user ID and password as receiving "
 "will be used."
 msgstr ""
-"����仍亳 仂����舒于亳���� ����亳 仗仂仍�� 仗��������仄亳, 弍��亟���� 亳��仗仂仍��亰仂于舒��������\n"
-"亳仄�� 仗仂仍��亰仂于舒��亠仍�� 亳 仗舒��仂仍��, 亰舒亟舒仆仆��亠 亟仍�� 仗��亳亠仄舒 仗仂������."
+"����仍亳 仂����舒于亳���� ����亳 仗仂仍�� 仗��������仄亳, 弍��亟���� 亳��仗仂仍��亰仂于舒�������� 亳仄�� 仗仂仍��亰仂于舒��亠仍�� 亳 "
+"仗舒��仂仍��, 亰舒亟舒仆仆��亠 亟仍�� 仗��亳��仄舒 仗仂������."
 
 #: src/prefs_account_dialog.c:1171
 msgid "Authenticate with POP3 before sending"
@@ -4292,7 +4255,7 @@ msgstr "弌从������仆仂"
 
 #: src/prefs_account_dialog.c:1273
 msgid "Reply-To"
-msgstr "��弍��舒��仆��亶 舒亟��亠��"
+msgstr "��亟��亠�� 亟仍�� 仂��于亠��仂于"
 
 #: src/prefs_account_dialog.c:1326
 msgid "Sign message by default"
@@ -4304,7 +4267,7 @@ msgstr "丿亳����仂于舒���� ��仂仂弍��亠仆亳�� 仗仂 ��仄仂仍��舒仆亳��"
 
 #: src/prefs_account_dialog.c:1330
 msgid "Encrypt when replying to encrypted message"
-msgstr ""
+msgstr "丿亳����仂于舒���� 仂��于亠���� 仆舒 亰舒��亳����仂于舒仆仆��亠 ��仂仂弍��亠仆亳��"
 
 #: src/prefs_account_dialog.c:1332
 msgid "Use ASCII-armored format for encryption"
@@ -4373,9 +4336,8 @@ msgid "Use non-blocking SSL"
 msgstr "����仗仂仍��亰仂于舒���� 仆亠弍仍仂从亳�����ﾑ�亳亶 ��亠亢亳仄 SSL"
 
 #: src/prefs_account_dialog.c:1543
-#, fuzzy
 msgid "Turn this off if you have problems in SSL connection."
-msgstr "(����从仍�ﾑ�亳��亠 ������ 仂仗��亳��, 亠��仍亳 于仂亰仆亳从舒�ﾑ� 仗��仂弍仍亠仄�� 仗��亳 亳��仗仂仍��亰仂于舒仆亳亳 SSL)"
+msgstr "����从仍�ﾑ�亳��亠 ������ 仂仗��亳��, 亠��仍亳 于仂亰仆亳从舒�ﾑ� 仗��仂弍仍亠仄�� 仗��亳 亳��仗仂仍��亰仂于舒仆亳亳 SSL."
 
 #: src/prefs_account_dialog.c:1633
 msgid "Specify SMTP port"
@@ -4403,12 +4365,11 @@ msgstr "��舒��舒仍仂亞 ��亠��于亠��舒 IMAP4"
 
 #: src/prefs_account_dialog.c:1687
 msgid "Only the subfolders of this directory will be displayed."
-msgstr ""
+msgstr "����亟���� 仂��仂弍��舒亢亠仆�� ��仂仍��从仂 仗仂亟从舒��舒仍仂亞亳 ����仂亞仂 从舒��舒仍仂亞舒."
 
 #: src/prefs_account_dialog.c:1690
-#, fuzzy
 msgid "Clear all message caches on exit"
-msgstr "����亳仆亳仄舒���� 于��亠 ��仂仂弍��亠仆亳�� �� ��亠��于亠��舒"
+msgstr "����亳��舒���� 从亠�� ��仂仂弍��亠仆亳亶 仗��亳 于����仂亟亠"
 
 #: src/prefs_account_dialog.c:1735
 msgid "Put sent messages in"
@@ -4419,21 +4380,20 @@ msgid "Put draft messages in"
 msgstr "弌仂����舒仆������ ��亠��仆仂于亳从亳 于"
 
 #: src/prefs_account_dialog.c:1739
-#, fuzzy
 msgid "Put queued messages in"
-msgstr "弌仂����舒仆������ ��亟舒仍亠仆仆��亠 ��仂仂弍��亠仆亳�� 于"
+msgstr "弌仂����舒仆������ ��仂仂弍��亠仆亳��, 仂亢亳亟舒�ﾑ�亳亠 仂��仗��舒于从亳, 于"
 
 #: src/prefs_account_dialog.c:1741
 msgid "Put deleted messages in"
-msgstr "弌仂����舒仆������ ��亟舒仍亠仆仆��亠 ��仂仂弍��亠仆亳�� 于"
+msgstr "弌仂����舒仆������ ��亟舒仍��仆仆��亠 ��仂仂弍��亠仆亳�� 于"
 
 #: src/prefs_account_dialog.c:1805
 msgid "Account name is not entered."
-msgstr "��亠 ��从舒亰舒仆仂 亳仄�� ����亠��仆仂亶 亰舒仗亳��亳."
+msgstr "��亠 ��从舒亰舒仆仂 亳仄�� ��������仆仂亶 亰舒仗亳��亳."
 
 #: src/prefs_account_dialog.c:1809
 msgid "Mail address is not entered."
-msgstr "��亠 ��从舒亰舒仆 舒亟��亠��."
+msgstr "��亠 ��从舒亰舒仆 舒亟��亠�� E-Mail."
 
 #: src/prefs_account_dialog.c:1814
 msgid "SMTP server is not entered."
@@ -4441,7 +4401,7 @@ msgstr "��亠 ��从舒亰舒仆 ��亠��于亠�� SMTP."
 
 #: src/prefs_account_dialog.c:1819
 msgid "User ID is not entered."
-msgstr "��亠 ��从舒亰舒仆 亳亟亠仆��亳��亳从舒��仂�� 仗仂仍��亰仂于舒��亠仍��."
+msgstr "��亠 ��从舒亰舒仆仂 亳仄�� 仗仂仍��亰仂于舒��亠仍��."
 
 #: src/prefs_account_dialog.c:1824
 msgid "POP3 server is not entered."
@@ -4457,7 +4417,7 @@ msgstr "��亠 ��从舒亰舒仆 ��亠��于亠�� NNTP."
 
 #: src/prefs_account_dialog.c:1860
 msgid "Specified folder is not a queue folder."
-msgstr ""
+msgstr "丕从舒亰舒仆仆舒�� 仗舒仗从舒 仆亠 �磦仍�磳������ 仗舒仗从仂亶 仂��亠��亠亟亳 ��仂仂弍��亠仆亳亶."
 
 #: src/prefs_account_dialog.c:1934
 msgid ""
@@ -4503,19 +4463,19 @@ msgid ""
 "   %s for the text selection"
 msgstr ""
 "��舒亰于舒仆亳亠 于 仄亠仆��:\n"
-" ����仗仂仍��亰��亶��亠 ��舒亰亟亠仍亳��亠仍�� / 亟仍�� ��仂亰亟舒仆亳�� 于仍仂亢亠仆仆���� 仄亠仆��.\n"
+" ����仗仂仍��亰��亶��亠 ��舒亰亟亠仍亳��亠仍�� \"/\" 亟仍�� ��仂亰亟舒仆亳�� 于仍仂亢亠仆仆���� 仄亠仆��.\n"
 "��仂仄舒仆亟舒:\n"
 " ��舒��舒仍��仆��亶 ��亳仄于仂仍:\n"
 "   | - 仗亠��亠亟舒���� ��亠仍仂 ��仂仂弍��亠仆亳�� 亳仍亳 于��弍��舒仆仆��亶 ����舒亞仄亠仆��\n"
-"   > - 仗亠��亠亟舒���� 于于亠亟亠仆仆��亶 仗仂仍��亰仂于舒��亠仍亠仄 ��亠从����\n"
-"   * - 仗亠��亠亟舒���� 于于亠亟亠仆仆��亶 ��亠从����, 仆亠 仂��仂弍��舒亢舒���� ��亠从���� 仗��亳 于于仂亟亠\n"
+"   > - 仗亠��亠亟舒���� 于于亠亟��仆仆��亶 仗仂仍��亰仂于舒��亠仍亠仄 ��亠从����\n"
+"   * - 仗亠��亠亟舒���� 于于亠亟��仆仆��亶 ��亠从����, 仆亠 仂��仂弍��舒亢舒���� ��亠从���� 仗��亳 于于仂亟亠\n"
 " ��仂仆亠��仆��亶 ��亳仄于仂仍:\n"
-"   | - 亰舒仄亠仆亳���� ��仂亟亠��亢亳仄仂亠 ��仂仂弍��亠仆亳�� 亳仍亳 于��亟亠仍亠仆亳亠 仆舒 于��于仂亟 从仂仄舒仆亟��\n"
+"   | - 亰舒仄亠仆亳���� ��仂亟亠��亢亳仄仂亠 ��仂仂弍��亠仆亳�� 亳仍亳 于��亟亠仍亠仆仆��亶 ��亠从���� 仆舒 于��于仂亟 从仂仄舒仆亟��\n"
 "   > - 于����舒于亳���� 于��于仂亟 从仂仄舒仆亟�� 弍亠亰 亰舒仄亠仆�� 于��亟亠仍亠仆仆仂亞仂 ��亠从����舒\n"
 "   & - 仆亠 仂亢亳亟舒���� 亰舒于亠����亠仆亳�� 于��仗仂仍仆亠仆亳�� 从仂仄舒仆亟��\n"
 " ��舒仄亠仆�� 于 从仂仄舒仆亟仆仂亶 ������仂从亠:\n"
 "   %f - 亳仄�� ��舒亶仍舒 �� ��仂仂弍��亠仆亳亠仄\n"
-"   %F - ��仗亳��仂从 亳仄亠仆 ��舒亶仍仂于 �� 于��弍��舒仆仆��仄亳 ��仂仂弍��亠仆亳�礆亳\n"
+"   %F - ��仗亳��仂从 亳仄��仆 ��舒亶仍仂于 �� 于��弍��舒仆仆��仄亳 ��仂仂弍��亠仆亳�礆亳\n"
 "   %p - 于��亟亠仍亠仆仆舒�� ��舒������ ��仂仂弍��亠仆亳��\n"
 "   %u - 仗舒��舒仄亠����, 亰舒亟舒于舒亠仄��亶 仗仂仍��亰仂于舒��亠仍亠仄\n"
 "   %h - 仗舒��舒仄亠����, 亰舒亟舒于舒亠仄��亶 仗仂仍��亰仂于舒��亠仍亠仄; 仆亠 仂��仂弍��舒亢舒���� ��亠从���� 仗��亳 于于仂亟亠\n"
@@ -4553,7 +4513,7 @@ msgstr "��舒亰于舒仆亳亠 于 仄亠仆�� 仆亠 ��从舒亰舒仆仂."
 
 #: src/prefs_actions.c:473
 msgid "Colon ':' is not allowed in the menu name."
-msgstr "��于仂亠��仂��亳亠 ':' 仆亠 亟仂仗����从舒亠������ 于 ��亠从����亠 ��仍亠仄亠仆��舒 仄亠仆��."
+msgstr "��于仂亠��仂��亳亠 \":\" 仆亠 亟仂仗����从舒亠������ 于 ��亠从����亠 ��仍亠仄亠仆��舒 仄亠仆��."
 
 #: src/prefs_actions.c:483
 msgid "Menu name is too long."
@@ -4598,13 +4558,12 @@ msgid "Display"
 msgstr "����仂弍��舒亢亠仆亳亠"
 
 #: src/prefs_common_dialog.c:665
-#, fuzzy
 msgid "Junk mail"
-msgstr "仗舒仗从��:"
+msgstr "弌仗舒仄"
 
 #: src/prefs_common_dialog.c:671
 msgid "Details"
-msgstr ""
+msgstr "����仂��亠亠"
 
 #: src/prefs_common_dialog.c:725
 msgid "Auto-check new mail"
@@ -4624,12 +4583,11 @@ msgstr "����仂于亠�������� 仗��亳��仂亟 仆仂于���� ��仂仂弍��亠仆亳亶 仗��亳 亰�
 
 #: src/prefs_common_dialog.c:750
 msgid "Update all local folders after incorporation"
-msgstr "��弍仆仂于亳���� 于��亠 仍仂从舒仍��仆��亠 仗舒仗从亳 仗仂��仍亠 仗��亳亠仄舒"
+msgstr "��弍仆仂于亳���� 于��亠 仍仂从舒仍��仆��亠 仗舒仗从亳 仗仂��仍亠 仗��亳��仄舒"
 
 #: src/prefs_common_dialog.c:755
-#, fuzzy
 msgid "Execute command when new messages arrived"
-msgstr "��亠仄亠亟仍亠仆仆仂 于��仗仂仍仆������ 仗亠��亠仄亠��亠仆亳亠 亳 ��亟舒仍亠仆亳亠 ��仂仂弍��亠仆亳亶"
+msgstr "����仗仂仍仆������ 从仂仄舒仆亟��, 从仂亞亟舒 仗仂������仗亳仍亳 仆仂于��亠 ��仂仂弍��亠仆亳��"
 
 #: src/prefs_common_dialog.c:767 src/prefs_common_dialog.c:2383
 #: src/prefs_common_dialog.c:2405
@@ -4637,18 +4595,17 @@ msgid "Command"
 msgstr "��仂仄舒仆亟舒"
 
 #: src/prefs_common_dialog.c:778
-#, fuzzy, c-format
+#, c-format
 msgid "`%d' will be replaced with the number of new messages."
-msgstr "��仂仍����亠仆亳亠 从仂仍亳��亠����于舒 仆仂于���� ��仂仂弍��亠仆亳亶 (STAT)..."
+msgstr "\"%d\" 弍��亟亠�� 亰舒仄亠仆亠仆仂 仆舒 ��亳��仍仂 仆仂于���� ��仂仂弍��亠仆亳亶."
 
 #: src/prefs_common_dialog.c:782
-#, fuzzy
 msgid "Incorporate from local spool"
 msgstr "����亳仆亳仄舒���� 亳亰 ��仗��仍舒"
 
 #: src/prefs_common_dialog.c:795
 msgid "Filter on incorporation"
-msgstr "个亳仍������仂于舒���� 仗��亳 仗��亳亠仄亠"
+msgstr "个亳仍������仂于舒���� 仗��亳 仗��亳��仄亠"
 
 #: src/prefs_common_dialog.c:801
 msgid "Spool path"
@@ -4660,30 +4617,27 @@ msgstr "弌仂����舒仆������ 仂��仗��舒于仍亠仆仆��亠 ��仂仂弍��亠仆亳�� 于 仗舒仗
 
 #: src/prefs_common_dialog.c:854
 msgid "Apply filter rules to sent messages"
-msgstr ""
+msgstr "����亳仄亠仆������ ��亳仍�������� 从 仂��仗��舒于仍亠仆仆��仄 ��仂仂弍��亠仆亳�礆"
 
 #: src/prefs_common_dialog.c:861
 msgid "Transfer encoding"
 msgstr "��仂亟亳��仂于舒仆亳亠 ��亠从����舒 ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:884
-#, fuzzy
 msgid ""
 "Specify Content-Transfer-Encoding used when message body contains non-ASCII "
 "characters."
 msgstr ""
-"丕从舒亢亳��亠 仄亠��仂亟 从仂亟亳��仂于舒仆亳�� ��亠从����仂于 ��仂仂弍��亠仆亳亶, ��仂亟亠��亢舒��亳�� ��亳仄于仂仍��\n"
-"仆亠 亳亰 亟亳舒仗舒亰仂仆舒 ASCII (Content-Transfer-Encoding)."
+"丕从舒亢亳��亠 仄亠��仂亟 从仂亟亳��仂于舒仆亳�� ��亠从����仂于 ��仂仂弍��亠仆亳亶, ��仂亟亠��亢舒��亳�� ��亳仄于仂仍�� 仆亠 亳亰 "
+"亟亳舒仗舒亰仂仆舒 ASCII (Content-Transfer-Encoding)."
 
 #: src/prefs_common_dialog.c:891
-#, fuzzy
 msgid "MIME filename encoding"
-msgstr "��仂亟亳��仂于从舒 仂��仗��舒于仍�磳仄���� ��仂仂弍��亠仆亳亶"
+msgstr "��仂亟亳��仂于舒仆亳亠 亳仄��仆 ��舒亶仍仂于 于 MIME"
 
 #: src/prefs_common_dialog.c:902
-#, fuzzy
 msgid "MIME header"
-msgstr "��仂亟亳��仂于从舒 仂��仗��舒于仍�磳仄���� ��仂仂弍��亠仆亳亶"
+msgstr "��舒亞仂仍仂于仂从 MIME"
 
 #: src/prefs_common_dialog.c:912
 msgid ""
@@ -4691,6 +4645,11 @@ msgid ""
 "MIME header: most popular, but violates RFC 2047\n"
 "RFC 2231: conforms to standard, but not popular"
 msgstr ""
+"丕从舒亢亳��亠 仄亠��仂亟 从仂亟亳��仂于舒仆亳�� 亳仄��仆 ��舒亶仍仂于 亟仍�� 于仍仂亢亠仆亳亶, 亠��仍亳 ����亳 亳仄亠仆舒 ��仂亟亠��亢舒�� "
+"仆舒��亳仂仆舒仍��仆��亠 ��亳仄于仂仍��.\n"
+"\"��舒亞仂仍仂于仂从 MIME\" - ��舒����仂 亳��仗仂仍��亰��亠������, 仂亟仆舒从仂 仆舒������舒亠�� RFC 2047.\n"
+"\"RFC 2231\" - 仄亠��仂亟, ��仂仂��于亠������于���ﾑ�亳亶 ����舒仆亟舒����舒仄 Internet, 仆仂 仆亠 ��舒弍仂��舒�ﾑ�亳亶 "
+"�� 仆亠从仂��仂����仄亳 仆亠��于仂弍仂亟仆��仄亳 仗仂����仂于��仄亳 仗��仂亞��舒仄仄舒仄亳."
 
 #: src/prefs_common_dialog.c:979 src/prefs_common_dialog.c:1364
 #: src/prefs_folder_item.c:139
@@ -4707,7 +4666,7 @@ msgstr "��仂弍舒于仍������ 舒于��仂仄舒��亳��亠��从亳"
 
 #: src/prefs_common_dialog.c:1013
 msgid "Automatically select account for replies"
-msgstr "��于��仂仄舒��亳��亠��从亳 于��弍亳��舒���� ����亠��仆���� 亰舒仗亳���� 仗��亳 仂��于亠��亠"
+msgstr "��于��仂仄舒��亳��亠��从亳 于��弍亳��舒���� ��������仆���� 亰舒仗亳���� 仗��亳 仂��于亠��亠"
 
 #: src/prefs_common_dialog.c:1015
 msgid "Quote message when replying"
@@ -4742,18 +4701,16 @@ msgid "Wrap on input"
 msgstr "��亠��亠仆仂��亳���� 仗��亳 于于仂亟亠"
 
 #: src/prefs_common_dialog.c:1095
-#, fuzzy
 msgid "Auto-save to draft"
-msgstr "弌仂����舒仆亳���� 于 仗舒仗从亠 ��亠��仆仂于亳从仂于"
+msgstr "��于��仂仄舒��亳��亠��从亳 ��仂����舒仆������ 于 仗舒仗从亠 ��亠��仆仂于亳从仂于"
 
 #: src/prefs_common_dialog.c:1120
-#, fuzzy
 msgid "Format"
-msgstr "��弍����仆��亶"
+msgstr "个仂��仄舒��"
 
 #: src/prefs_common_dialog.c:1125
 msgid "Spell checking"
-msgstr ""
+msgstr "����仂于亠��从舒 仂����仂亞��舒��亳亳"
 
 #. reply
 #: src/prefs_common_dialog.c:1175
@@ -4775,32 +4732,28 @@ msgstr " ��仗亳��舒仆亳亠 ��亳仄于仂仍仂于 "
 
 #: src/prefs_common_dialog.c:1293
 msgid "Enable Spell checking"
-msgstr ""
+msgstr "����仂于亠�������� 仂����仂亞��舒��亳��"
 
 #: src/prefs_common_dialog.c:1305
-#, fuzzy
 msgid "Default language:"
-msgstr "��舒仗从舒 亟仍�� 于��仂亟����亳�� ��仂仂弍��亠仆亳亶"
+msgstr "亊亰��从 仗仂 ��仄仂仍��舒仆亳��:"
 
 #: src/prefs_common_dialog.c:1372
-#, fuzzy
 msgid "Text font"
-msgstr "丐亠从����"
+msgstr "丿��亳���� 亟仍�� ��亠从����舒"
 
 #. ---- Folder View ----
 #: src/prefs_common_dialog.c:1384
-#, fuzzy
 msgid "Folder View"
-msgstr "��舒仗从舒"
+msgstr "��亠��亠于仂 仗舒仗仂从"
 
 #: src/prefs_common_dialog.c:1392
 msgid "Display unread number next to folder name"
 msgstr "��仂从舒亰��于舒���� ��亳��仍仂 仆亠仗��仂��亳��舒仆仆���� ��仂仂弍��亠仆亳亶 ���磲仂仄 �� 亳仄亠仆亠仄 仗舒仗从亳"
 
 #: src/prefs_common_dialog.c:1394
-#, fuzzy
 msgid "Display message number columns in the folder view"
-msgstr "��仂从舒亰��于舒���� ��亳��仍仂 仆亠仗��仂��亳��舒仆仆���� ��仂仂弍��亠仆亳亶 ���磲仂仄 �� 亳仄亠仆亠仄 仗舒仗从亳"
+msgstr "����仂弍��舒亢舒���� ����仂仍弍���� �� ��亳��仍仂仄 ��仂仂弍��亠仆亳亶 于 亟亠��亠于亠 仗舒仗仂从"
 
 #: src/prefs_common_dialog.c:1403
 msgid "Abbreviate newsgroups longer than"
@@ -4817,7 +4770,7 @@ msgstr "弌仗亳��仂从 ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:1433
 msgid "Display recipient on `From' column if sender is yourself"
-msgstr "��仂从舒亰��于舒���� 仗仂仍����舒��亠仍�� 于 从仂仍仂仆从亠 '����', 亠��仍亳 仂��仗��舒于亳��亠仍�� - ����"
+msgstr "��仂从舒亰��于舒���� 仗仂仍����舒��亠仍�� 于 从仂仍仂仆从亠 \"����\", 亠��仍亳 仂��仗��舒于亳��亠仍�� - 于��"
 
 #: src/prefs_common_dialog.c:1435
 msgid "Expand threads"
@@ -4837,27 +4790,26 @@ msgid "Message"
 msgstr "弌仂仂弍��亠仆亳亠"
 
 #: src/prefs_common_dialog.c:1480
-#, fuzzy
 msgid "Default character encoding"
-msgstr "/��亳亟/弌仂����亳��仂于从舒/��仂 ��弍��于舒仆亳��"
+msgstr "��仂亟亳��仂于从舒 仗仂 ��仄仂仍��舒仆亳��"
 
 #: src/prefs_common_dialog.c:1494
 msgid "This is used when displaying messages with missing character encoding."
 msgstr ""
+"亅��舒 从仂亟亳��仂于从舒 亳��仗仂仍��亰��亠������ 亟仍�� 仂��仂弍��舒亢亠仆亳�� ��仂仂弍��亠仆亳亶, 于 从仂��仂������ 仂������������于��亠�� "
+"�磦仆仂亠 ��从舒亰舒仆亳亠 从仂亟亳��仂于从亳."
 
 #: src/prefs_common_dialog.c:1500
-#, fuzzy
 msgid "Outgoing character encoding"
-msgstr "/��亳亟/弌仂����亳��仂于从舒/��仂 ��弍��于舒仆亳��"
+msgstr "��仂亟亳��仂于从舒 亟仍�� 仂��仗��舒于仍�磳仄���� ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:1514
-#, fuzzy
 msgid ""
 "If `Automatic' is selected, the optimal encoding for the current locale will "
 "be used."
 msgstr ""
-"����亳 于��弍仂��亠 于舒��亳舒仆��舒 '��于��仂仄舒��亳��亠��从亳' 弍��亟亠�� 亳��仗仂仍��亰仂于舒仆舒\n"
-"仂仗��亳仄舒仍��仆舒�� 从仂亟亳��仂于从舒 亟仍�� ��亠从����亠亞仂 �磶��从舒 亳 ������舒仆��."
+"����亳 于��弍仂��亠 于舒��亳舒仆��舒 \"��于��仂仄舒��亳��亠��从亳\" 弍��亟亠�� 亳��仗仂仍��亰仂于舒仆舒 仂仗��亳仄舒仍��仆舒�� "
+"从仂亟亳��仂于从舒 亟仍�� ��亠从����亠亞仂 �磶��从舒 亳 ������舒仆��."
 
 #: src/prefs_common_dialog.c:1575
 msgid "Enable coloration of message"
@@ -4877,16 +4829,15 @@ msgstr "��仂从舒亰��于舒���� 仗舒仆亠仍�� 亰舒亞仂仍仂于从仂于 仆舒亟 仂弍仍舒��
 
 #: src/prefs_common_dialog.c:1604
 msgid "Display short headers on message view"
-msgstr "��仂从舒亰��于舒���� ��仂从��舒��亠仆仆��亠 亰舒亞仂仍仂于从亳 仗��亳 仗��仂��仄仂����亠 ��仂仂弍��亠仆亳亶"
+msgstr "��仂从舒亰��于舒���� ��仂从��舒����仆仆��亠 亰舒亞仂仍仂于从亳 仗��亳 仗��仂��仄仂����亠 ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:1616
 msgid "Render HTML messages as text"
-msgstr ""
+msgstr "����仂弍��舒亢舒���� ��仂仂弍��亠仆亳�� 于 ��仂��仄舒��亠 HTML 从舒从 ��亠从����"
 
 #: src/prefs_common_dialog.c:1620
-#, fuzzy
 msgid "Display cursor in message view"
-msgstr "��仂从舒亰��于舒���� ��仂从��舒��亠仆仆��亠 亰舒亞仂仍仂于从亳 仗��亳 仗��仂��仄仂����亠 ��仂仂弍��亠仆亳亶"
+msgstr "����仂弍��舒亢舒���� 从������仂�� 于 仂弍仍舒����亳 仗��仂��仄仂����舒 ��仂仂弍��亠仆亳��"
 
 #: src/prefs_common_dialog.c:1633
 msgid "Line space"
@@ -4914,70 +4865,64 @@ msgstr "丿舒亞"
 
 #: src/prefs_common_dialog.c:1691
 msgid "Images"
-msgstr ""
+msgstr "��亰仂弍��舒亢亠仆亳��"
 
 #: src/prefs_common_dialog.c:1699
 msgid "Resize attached large images to fit in the window"
-msgstr "��舒������舒弍亳��仂于舒���� 仗��亳��仂亠亟亳仆亠仆仆��亠 亳亰仂弍��舒亢亠仆亳�� 仗仂 ��舒亰仄亠���� 仂从仆舒"
+msgstr "��舒������舒弍亳��仂于舒���� 仗��亳��仂亠亟亳仆��仆仆��亠 亳亰仂弍��舒亢亠仆亳�� 仗仂 ��舒亰仄亠���� 仂从仆舒"
 
 #: src/prefs_common_dialog.c:1701
-#, fuzzy
 msgid "Display images as inline"
-msgstr "��舒������仂亶从舒 仂��仂弍��舒亢亠仆亳�� 亰舒亞仂仍仂于从仂于"
+msgstr "��仂从舒亰��于舒���� 亳亰仂弍��舒亢亠仆亳�� 于 ��亠从����亠 ��仂仂弍��亠仆亳��"
 
 #: src/prefs_common_dialog.c:1785
-#, fuzzy
 msgid "Enable Junk mail control"
-msgstr "仗舒仗从��:"
+msgstr "��从仍�ﾑ�亳���� 舒于��仂仄舒��亳��亠��从���� ��亳仍������舒��亳�� ��仗舒仄舒"
 
 #: src/prefs_common_dialog.c:1797
-#, fuzzy
 msgid "Learning command:"
-msgstr "����仗仂仍仆亳���� 从仂仄舒仆亟��"
+msgstr "��仂仄舒仆亟�� 亟仍�� 仂弍����亠仆亳��:"
 
 #: src/prefs_common_dialog.c:1806
-#, fuzzy
 msgid "(Select preset)"
-msgstr "����弍仂�� 从仍�ﾑ�舒"
+msgstr "(����弍亠��亳��亠 ����舒仆亟舒����仆���� 仆舒������仂亶从��)"
 
 #: src/prefs_common_dialog.c:1831
 msgid "Not Junk"
-msgstr ""
+msgstr "��亠 ��仗舒仄"
 
 #: src/prefs_common_dialog.c:1846
-#, fuzzy
 msgid "Classifying command"
-msgstr "����仗仂仍仆亳���� 从仂仄舒仆亟��"
+msgstr "��仂仄舒仆亟舒 从仍舒����亳��亳从舒��亳亳"
 
 #: src/prefs_common_dialog.c:1857
 msgid ""
 "To classify junk mails automatically, both junk and not junk mails must be "
 "learned manually to a certain extent."
 msgstr ""
+"��仍�� 舒于��仂仄舒��亳��亠��从仂亶 从仍舒����亳��亳从舒��亳亳 ��仂仂弍��亠仆亳亶 仆亠仂弍��仂亟亳仄仂 仗��亠亟于舒��亳��亠仍��仆仂 "
+"仂��仄亠��亳���� 于������仆���� 仆亠从仂��仂��仂亠 从仂仍亳��亠����于仂 ��仂仂弍��亠仆亳亶, 从舒从 �磦仍���ﾑ�亳������, ��舒从 亳 仆亠 "
+"�磦仍���ﾑ�亳������ ��仗舒仄仂仄."
 
 #: src/prefs_common_dialog.c:1867
-#, fuzzy
 msgid "Junk folder"
-msgstr "仗舒仗从��:"
+msgstr "��舒仗从舒 亟仍�� ��仗舒仄舒"
 
 #: src/prefs_common_dialog.c:1885
-#, fuzzy
 msgid "The messages which are set as junk mail will be moved to this folder."
-msgstr "(��亠仂����亳仍������仂于舒仆仆��亠 ��仂仂弍��亠仆亳�� 弍��亟���� ��仂����舒仆亠仆�� 于 ����仂亶 仗舒仗从亠)"
+msgstr "弌仂仂弍��亠仆亳��, 仗仂仄亠��亠仆仆��亠 从舒从 ��仗舒仄, 弍��亟���� 仗亠��亠仄亠��亠仆�� 于 ������ 仗舒仗从��."
 
 #: src/prefs_common_dialog.c:1896
-#, fuzzy
 msgid "Filter messages classified as junk on receiving"
-msgstr "个亳仍������仂于舒���� ��仂仂弍��亠仆亳�� 仗��亳 仗��亳亠仄亠"
+msgstr "����仂于亠�������� ��仂仂弍��亠仆亳�� 仆舒 ��仗舒仄 仗��亳 仗��亳��仄亠"
 
 #: src/prefs_common_dialog.c:1899
-#, fuzzy
 msgid "Delete junk mails from server on receiving"
-msgstr "丕亟舒仍亳���� �� ��亠��于亠��舒"
+msgstr "丕亟舒仍������ 仂弍仆舒����亢亠仆仆��亶 ��仗舒仄 �� ��亠��于亠��舒 仗��亳 仗��亳��仄亠"
 
 #: src/prefs_common_dialog.c:1903
 msgid "Mark filtered junk mails as read"
-msgstr ""
+msgstr "��仂仄亠��舒���� 仂����亳仍������仂于舒仆仆��亶 ��仗舒仄 从舒从 仗��仂��亳��舒仆仆��亶"
 
 #: src/prefs_common_dialog.c:1944
 msgid "Automatically check signatures"
@@ -5000,11 +4945,9 @@ msgid "minute(s) "
 msgstr "仄亳仆����"
 
 #: src/prefs_common_dialog.c:1992
-#, fuzzy
 msgid "Setting to '0' will store the passphrase for the whole session."
 msgstr ""
-"(����亳 ������舒仆仂于从亠 于 0 仗舒��仂仍��仆舒�� ����舒亰舒 弍��亟亠�� ����舒仆亳��������\n"
-" 于 ��亠��亠仆亳亠 于��亠亞仂 ��亠舒仆��舒)"
+"����亳 ������舒仆仂于从亠 于 0 仗舒��仂仍��仆舒�� ����舒亰舒 弍��亟亠�� ����舒仆亳�������� 于 ��亠��亠仆亳亠 于��亠亞仂 ��亠舒仆��舒."
 
 #: src/prefs_common_dialog.c:2001
 msgid "Grab input while entering a passphrase"
@@ -5028,27 +4971,24 @@ msgstr "��仂仄亠��舒���� ��仂仂弍��亠仆亳亠 从舒从 仗��仂��亳��舒仆仆仂亠 ��仂仍
 
 #: src/prefs_common_dialog.c:2083
 msgid "Go to inbox after receiving new mail"
-msgstr "��亠��亠亶��亳 于 仗舒仗从�� \"����仂亟����亳亠\" 仗仂��仍亠 仗��亳亠仄舒 仆仂于���� ��仂仂弍��亠仆亳亶"
+msgstr "��亠��亠亶��亳 于 仗舒仗从�� \"����仂亟����亳亠\" 仗仂��仍亠 仗��亳��仄舒 仆仂于���� ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:2091
 msgid "Execute immediately when moving or deleting messages"
 msgstr "��亠仄亠亟仍亠仆仆仂 于��仗仂仍仆������ 仗亠��亠仄亠��亠仆亳亠 亳 ��亟舒仍亠仆亳亠 ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:2103
-#, fuzzy
 msgid "Messages will be marked until execution if this is turned off."
 msgstr ""
-"(弌仂仂弍��亠仆亳�� 弍��亟���� 仗��仂����仂 仗仂仄亠��亠仆�� 亟仂 于��仗仂仍仆亠仆亳��, 亠��仍亳\n"
-" ����舒 仂仗��亳�� 仆亠 于从仍�ﾑ�亠仆舒)"
+"弌仂仂弍��亠仆亳�� 弍��亟���� 仗��仂����仂 仗仂仄亠��亠仆�� 亟仂 于��仗仂仍仆亠仆亳��, 亠��仍亳 ����舒 仂仗��亳�� 仆亠 于从仍�ﾑ�亠仆舒."
 
 #: src/prefs_common_dialog.c:2112
 msgid "Make the order of buttons comply with GNOME HIG"
-msgstr ""
+msgstr "��舒亰仄亠��舒���� 从仆仂仗从亳 于 仂从仆舒�� 于 ��仂仂��于亠������于亳亳 �� 仗��舒于亳仍舒仄亳 GNOME HIG"
 
 #: src/prefs_common_dialog.c:2114
-#, fuzzy
 msgid "Display tray icon"
-msgstr "����仂弍��舒亢舒亠仄仂亠 亳仄��"
+msgstr "����仂弍��舒亢舒���� 亰仆舒��仂从 仆舒 仗舒仆亠仍亳"
 
 #: src/prefs_common_dialog.c:2121
 msgid " Set key bindings... "
@@ -5059,17 +4999,16 @@ msgid "Other"
 msgstr "������亞仂亠"
 
 #: src/prefs_common_dialog.c:2131
-#, fuzzy
 msgid "External commands"
-msgstr "����仗仂仍仆亳���� 从仂仄舒仆亟��"
+msgstr "��仆亠��仆亳亠 从仂仄舒仆亟��"
 
 #: src/prefs_common_dialog.c:2180
 msgid "Receive dialog"
-msgstr "��从仆仂 仗��亳亠仄舒 ��仂仂弍��亠仆亳亶"
+msgstr "��从仆仂 仗��亳��仄舒 ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:2190
 msgid "Show receive dialog"
-msgstr "��仂从舒亰��于舒���� 仂从仆仂 仗��亳亠仄舒 ��仂仂弍��亠仆亳亶"
+msgstr "��仂从舒亰��于舒���� 仂从仆仂 仗��亳��仄舒 ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:2200
 msgid "Always"
@@ -5077,7 +5016,7 @@ msgstr "����亠亞亟舒"
 
 #: src/prefs_common_dialog.c:2201
 msgid "Only on manual receiving"
-msgstr "丐仂仍��从仂 仗��亳 ������仆仂仄 亰舒仗����从亠 仗��亳亠仄舒"
+msgstr "丐仂仍��从仂 仗��亳 ������仆仂仄 亰舒仗����从亠 仗��亳��仄舒"
 
 #: src/prefs_common_dialog.c:2203
 msgid "Never"
@@ -5089,7 +5028,7 @@ msgstr "��亠 仂��仂弍��舒亢舒���� ��仂仂弍��亠仆亳亠 仂弍 仂��亳弍从亠 仗��亳 仗
 
 #: src/prefs_common_dialog.c:2211
 msgid "Close receive dialog when finished"
-msgstr "��舒从����于舒���� 仂从仆仂 仗��亳亠仄舒 ��仂仂弍��亠仆亳亶 仗仂��仍亠 亰舒于亠����亠仆亳��"
+msgstr "��舒从����于舒���� 仂从仆仂 仗��亳��仄舒 ��仂仂弍��亠仆亳亶 仗仂��仍亠 亰舒于亠����亠仆亳��"
 
 #: src/prefs_common_dialog.c:2222
 msgid "Add address to destination when double-clicked"
@@ -5101,7 +5040,7 @@ msgstr "����亳 于����仂亟亠"
 
 #: src/prefs_common_dialog.c:2232
 msgid "Confirm on exit"
-msgstr "��仂亟��于亠��亢亟亠仆亳亠 仗��亳 于����仂亟亠"
+msgstr "��舒仗��舒��亳于舒���� 仗仂亟��于亠��亢亟亠仆亳亠 仗��亳 于����仂亟亠"
 
 #: src/prefs_common_dialog.c:2239
 msgid "Empty trash on exit"
@@ -5118,7 +5057,7 @@ msgstr "����亠亟��仗��亠亢亟舒���� 仂 仆舒仍亳��亳亳 ��仂仂弍��亠仆亳亶 于 仂���
 #: src/prefs_common_dialog.c:2297
 #, c-format
 msgid "External commands (%s will be replaced with file name / URI)"
-msgstr "��仆亠��仆亳亠 从仂仄舒仆亟�� (%s 弍��亟亠�� 亰舒仄亠仆亠仆 仆舒 亳仄�� ��舒亶仍舒/URI)"
+msgstr "��仆亠��仆亳亠 从仂仄舒仆亟�� (%s 弍��亟亠�� 亰舒仄亠仆亠仆仂 仆舒 亳仄�� ��舒亶仍舒/URI)"
 
 #: src/prefs_common_dialog.c:2306
 msgid "Web browser"
@@ -5126,22 +5065,20 @@ msgstr "Web-弍��舒��亰亠��"
 
 #: src/prefs_common_dialog.c:2318 src/prefs_common_dialog.c:3751
 #: src/prefs_common_dialog.c:3772
-#, fuzzy
 msgid "(Default browser)"
-msgstr "��舒仗从舒 亟仍�� 于��仂亟����亳�� ��仂仂弍��亠仆亳亶"
+msgstr "(����舒��亰亠�� 仗仂 ��仄仂仍��舒仆亳��)"
 
 #: src/prefs_common_dialog.c:2371
 msgid "Use external program for incorporation"
-msgstr "����仗仂仍��亰仂于舒���� 于仆亠��仆�ﾑ� 仗��仂亞��舒仄仄�� 亟仍�� 仗��亳亠仄舒"
+msgstr "����仗仂仍��亰仂于舒���� 于仆亠��仆�ﾑ� 仗��仂亞��舒仄仄�� 亟仍�� 仗��亳��仄舒 仗仂������"
 
 #: src/prefs_common_dialog.c:2393
 msgid "Use external program for sending"
-msgstr "����仗仂仍��亰仂于舒���� 于仆亠��仆�ﾑ� 仗��仂亞��舒仄仄�� 亟仍�� 仂��仗��舒于从亳"
+msgstr "����仗仂仍��亰仂于舒���� 于仆亠��仆�ﾑ� 仗��仂亞��舒仄仄�� 亟仍�� 仂��仗��舒于从亳 仗仂������"
 
 #: src/prefs_common_dialog.c:2451
-#, fuzzy
 msgid "Enable strict checking of the integrity of summary caches"
-msgstr "��舒仗亳���� 从亠��舒 ��仗亳��从舒 (%s)..."
+msgstr "����仂于亠�������� ��亠仍仂����仆仂������ 从亠��舒 ��仗亳��从舒 ��仂仂弍��亠仆亳亶"
 
 #: src/prefs_common_dialog.c:2454
 msgid ""
@@ -5149,6 +5086,9 @@ msgid ""
 "by other applications.\n"
 "This option will degrade the performance of displaying summary."
 msgstr ""
+"��从仍�ﾑ�亳��亠 ������ 仗��仂于亠��从��, 亠��仍亳 ��仂亟亠��亢亳仄仂亠 仗舒仗仂从 仄仂亢亠�� 仄亠仆���������� 亟����亞亳仄亳 "
+"仗��仂亞��舒仄仄舒仄亳.\n"
+"��从仍�ﾑ�亠仆亳亠 仗��仂于亠��从亳 亰舒仄亠亟仍�磳�� 仂��仂弍��舒亢亠仆亳亠 ��仗亳��从仂于 ��仂仂弍��亠仆亳亶."
 
 #: src/prefs_common_dialog.c:2461
 msgid "Socket I/O timeout:"
@@ -5179,9 +5119,8 @@ msgid "Western European (ISO-8859-15)"
 msgstr "��舒仗舒亟仆仂亠于��仂仗亠亶��从舒�� (ISO-8859-15)"
 
 #: src/prefs_common_dialog.c:2514
-#, fuzzy
 msgid "Western European (Windows-1252)"
-msgstr "��舒仗舒亟仆仂亠于��仂仗亠亶��从舒�� (ISO-8859-15)"
+msgstr "��舒仗舒亟仆仂亠于��仂仗亠亶��从舒�� (Windows-1252)"
 
 #: src/prefs_common_dialog.c:2518
 msgid "Central European (ISO-8859-2)"
@@ -5189,35 +5128,31 @@ msgstr "丶亠仆����舒仍��仆仂亠于��仂仗亠亶��从舒�� (ISO-8859-2)"
 
 #: src/prefs_common_dialog.c:2520
 msgid "Baltic (ISO-8859-13)"
-msgstr "��舒仍��亳亶��从舒�� (ISO-8859-13)"
+msgstr "����亳弍舒仍��亳亶��从舒�� (ISO-8859-13)"
 
 #: src/prefs_common_dialog.c:2521
 msgid "Baltic (ISO-8859-4)"
-msgstr "��舒仍��亳亶��从舒�� (ISO-8859-4)"
+msgstr "����亳弍舒仍��亳亶��从舒�� (ISO-8859-4)"
 
 #: src/prefs_common_dialog.c:2523
 msgid "Greek (ISO-8859-7)"
 msgstr "����亠��亠��从舒�� (ISO-8859-7)"
 
 #: src/prefs_common_dialog.c:2525
-#, fuzzy
 msgid "Arabic (ISO-8859-6)"
-msgstr "��舒仍��亳亶��从舒�� (ISO-8859-4)"
+msgstr "����舒弍��从舒�� (ISO-8859-6)"
 
 #: src/prefs_common_dialog.c:2526
-#, fuzzy
 msgid "Arabic (Windows-1256)"
-msgstr "��亳��亳仍仍亳��舒 Win (Windows-1251)"
+msgstr "����舒弍��从舒�� (Windows-1256)"
 
 #: src/prefs_common_dialog.c:2528
-#, fuzzy
 msgid "Hebrew (ISO-8859-8)"
-msgstr "����亠��亠��从舒�� (ISO-8859-7)"
+msgstr "��于��亳�� (ISO-8859-8)"
 
 #: src/prefs_common_dialog.c:2529
-#, fuzzy
 msgid "Hebrew (Windows-1255)"
-msgstr "��亳��亳仍仍亳��舒 Win (Windows-1251)"
+msgstr "��于��亳�� (Windows-1255)"
 
 #: src/prefs_common_dialog.c:2531
 msgid "Turkish (ISO-8859-9)"
@@ -5229,15 +5164,15 @@ msgstr "��亳��亳仍仍亳��舒 (ISO-8859-5)"
 
 #: src/prefs_common_dialog.c:2534
 msgid "Cyrillic (KOI8-R)"
-msgstr "��������从舒�� (KOI8-R)"
+msgstr "��亳��亳仍仍亳��舒 (KOI8-R)"
 
 #: src/prefs_common_dialog.c:2535
 msgid "Cyrillic (KOI8-U)"
-msgstr "丕从��舒亳仆��从舒�� (KOI8-U)"
+msgstr "��亳��亳仍仍亳��舒/丕从��舒亳仆舒 (KOI8-U)"
 
 #: src/prefs_common_dialog.c:2536
 msgid "Cyrillic (Windows-1251)"
-msgstr "��亳��亳仍仍亳��舒 Win (Windows-1251)"
+msgstr "��亳��亳仍仍亳��舒 (Windows-1251)"
 
 #: src/prefs_common_dialog.c:2538
 msgid "Japanese (ISO-2022-JP)"
@@ -5253,20 +5188,19 @@ msgstr "亊仗仂仆��从舒�� (Shift_JIS)"
 
 #: src/prefs_common_dialog.c:2544
 msgid "Simplified Chinese (GB2312)"
-msgstr "丕仗��仂��亠仆仆舒�� 从亳��舒亶��从舒�� (GB2312)"
+msgstr "��亳��舒亶��从舒�� ��仗��仂����仆仆舒�� (GB2312)"
 
 #: src/prefs_common_dialog.c:2545
-#, fuzzy
 msgid "Simplified Chinese (GBK)"
-msgstr "丕仗��仂��亠仆仆舒�� 从亳��舒亶��从舒�� (GB2312)"
+msgstr "��亳��舒亶��从舒�� ��仗��仂����仆仆舒�� (GBK)"
 
 #: src/prefs_common_dialog.c:2546
 msgid "Traditional Chinese (Big5)"
-msgstr "丐��舒亟亳��亳仂仆仆舒�� 从亳��舒亶��从舒�� (Big5)"
+msgstr "��亳��舒亶��从舒�� ����舒亟亳��亳仂仆仆舒�� (Big5)"
 
 #: src/prefs_common_dialog.c:2548
 msgid "Traditional Chinese (EUC-TW)"
-msgstr "丐��舒亟亳��亳仂仆仆舒�� 从亳��舒亶��从舒�� (EUC-TW)"
+msgstr "��亳��舒亶��从舒�� ����舒亟亳��亳仂仆仆舒�� (EUC-TW)"
 
 #: src/prefs_common_dialog.c:2549
 msgid "Chinese (ISO-2022-CN)"
@@ -5286,7 +5220,7 @@ msgstr "丐舒亶��从舒�� (Windows-874)"
 
 #: src/prefs_common_dialog.c:2722
 msgid "the full abbreviated weekday name"
-msgstr "��仂从��舒��亠仆仆仂亠 仆舒亰于舒仆亳亠 亟仆�� 仆亠亟亠仍亳"
+msgstr "��仂从��舒����仆仆仂亠 仆舒亰于舒仆亳亠 亟仆�� 仆亠亟亠仍亳"
 
 #: src/prefs_common_dialog.c:2723
 msgid "the full weekday name"
@@ -5294,7 +5228,7 @@ msgstr "仗仂仍仆仂亠 仆舒亰于舒仆亳亠 亟仆�� 仆亠亟亠仍亳"
 
 #: src/prefs_common_dialog.c:2724
 msgid "the abbreviated month name"
-msgstr "��仂从��舒��亠仆仆仂亠 仆舒亰于舒仆亳亠 仄亠������舒"
+msgstr "��仂从��舒����仆仆仂亠 仆舒亰于舒仆亳亠 仄亠������舒"
 
 #: src/prefs_common_dialog.c:2725
 msgid "the full month name"
@@ -5460,7 +5394,7 @@ msgstr ""
 "弌仂亟亠��亢亳仄仂亠 ��仂仂弍��亠仆亳�� ��仂 亰仆舒从仂仄 ��亳��舒����\n"
 "弌仂亟亠��亢亳仄仂亠 ��仂仂弍��亠仆亳�� 弍亠亰 仗仂亟仗亳��亳\n"
 "弌仂亟亠��亢亳仄仂亠 ��仂仂弍��亠仆亳�� 弍亠亰 仗仂亟仗亳��亳 ��仂 亰仆舒从仂仄 ��亳��舒����\n"
-"弌亳仄于仂仍 '%'"
+"弌亳仄于仂仍 \"%\""
 
 #: src/prefs_common_dialog.c:3247
 msgid ""
@@ -5469,19 +5403,18 @@ msgid ""
 "Literal opening curly brace\n"
 "Literal closing curly brace"
 msgstr ""
-"弌亳仄于仂仍 '\\'\n"
-"弌亳仄于仂仍 '?'\n"
-"弌亳仄于仂仍 '{'\n"
-"弌亳仄于仂仍 '}'"
+"弌亳仄于仂仍 \"\\\"\n"
+"弌亳仄于仂仍 \"?\"\n"
+"弌亳仄于仂仍 \"{\"\n"
+"弌亳仄于仂仍 \"}\""
 
 #: src/prefs_common_dialog.c:3293
 msgid "Key bindings"
 msgstr "��仍舒于亳舒������仆��亠 从仂仄舒仆亟��"
 
 #: src/prefs_common_dialog.c:3306
-#, fuzzy
 msgid "Select the preset of key bindings."
-msgstr " 丕����舒仆仂于亳���� 从仍舒于亳舒������仆��亠 从仂仄舒仆亟��... "
+msgstr "����弍亠��亳��亠 于舒��亳舒仆�� 仆舒������仂亶从亳 从仍舒于亳舒������仆���� 从仂仄舒仆亟."
 
 #: src/prefs_common_dialog.c:3316 src/prefs_common_dialog.c:3640
 msgid "Default"
@@ -5489,7 +5422,7 @@ msgstr "��仂 ��仄仂仍��舒仆亳��"
 
 #: src/prefs_common_dialog.c:3319 src/prefs_common_dialog.c:3649
 msgid "Old Sylpheed"
-msgstr "弌��舒��舒�� Sylpheed"
+msgstr "弌��舒����亠 于亠����亳亳 Sylpheed"
 
 #: src/prefs_customheader.c:161
 msgid "Custom header setting"
@@ -5560,9 +5493,9 @@ msgid "Enabled"
 msgstr "��从仍."
 
 #: src/prefs_filter.c:687
-#, fuzzy, c-format
+#, c-format
 msgid "Do you really want to delete the rule '%s'?"
-msgstr "���� ��仂��亳��亠 ��亟舒仍亳���� 仗��舒于亳仍仂?"
+msgstr "���� ��仂��亳��亠 ��亟舒仍亳���� 仗��舒于亳仍仂 \"%s\"?"
 
 #: src/prefs_filter.c:689
 msgid "Delete rule"
@@ -5609,19 +5542,16 @@ msgid "Age"
 msgstr "��仂亰��舒���� ��仂仂弍��亠仆亳��"
 
 #: src/prefs_filter_edit.c:501 src/summaryview.c:517
-#, fuzzy
 msgid "Marked"
-msgstr "��亠��从舒"
+msgstr "��仂仄亠��亠仆仂"
 
 #: src/prefs_filter_edit.c:502
-#, fuzzy
 msgid "Has color label"
-msgstr "/����亟亠仍亠仆亳亠 ��于亠��仂仄"
+msgstr "����亟亠仍亠仆仂 ��于亠��仂仄"
 
 #: src/prefs_filter_edit.c:503
-#, fuzzy
 msgid "Has attachment"
-msgstr "��仍仂亢亠仆亳亠"
+msgstr "弌仂亟亠��亢亳�� 于仍仂亢亠仆亳��"
 
 #: src/prefs_filter_edit.c:516
 msgid "contains"
@@ -5665,12 +5595,11 @@ msgstr "仄亠仆����亠, ��亠仄"
 
 #: src/prefs_filter_edit.c:559
 msgid "matches to status"
-msgstr ""
+msgstr "��仂仂��于亠������于��亠�� ����舒�������� ��仂仂弍��亠仆亳��"
 
 #: src/prefs_filter_edit.c:560
-#, fuzzy
 msgid "doesn't match to status"
-msgstr "仆亠 ��仂仂��于亠������于��亠�� regex"
+msgstr "仆亠 ��仂仂��于亠������于��亠�� ����舒�������� ��仂仂弍��亠仆亳��"
 
 #: src/prefs_filter_edit.c:662
 msgid "Move to"
@@ -5721,7 +5650,6 @@ msgid "folder:"
 msgstr "仗舒仗从��:"
 
 #: src/prefs_filter_edit.c:1013
-#, fuzzy
 msgid "day(s)"
 msgstr "亟仆亠亶"
 
@@ -5775,9 +5703,8 @@ msgid "Folder properties"
 msgstr "弌于仂亶����于舒 仗舒仗从亳"
 
 #: src/prefs_folder_item.c:186
-#, fuzzy
 msgid "Identifier"
-msgstr "亅仍亠仄亠仆�� ��仂��仄舒��舒"
+msgstr "��亟亠仆��亳��亳从舒��仂��"
 
 #: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
@@ -5810,25 +5737,23 @@ msgstr "��亟��亠�� 亟仍�� 仂��于亠��仂于:"
 #: src/prefs_search_folder.c:164
 #, c-format
 msgid "%s - Edit search condition"
-msgstr ""
+msgstr "%s - ��亰仄亠仆亠仆亳亠 ����仍仂于亳�� 仗仂亳��从舒"
 
 #: src/prefs_search_folder.c:209 src/query_search.c:274
 msgid "Match any of the following"
-msgstr "��仂亳��从 仗仂 仍�ﾐ頴笑煮� 亳亰 仗仂仍亠亶:"
+msgstr "����从舒���� ��仂于仗舒亟亠仆亳�� 仗仂 仍�ﾐ頴笑煮� 亳亰 仗仂仍亠亶"
 
 #: src/prefs_search_folder.c:211 src/query_search.c:276
 msgid "Match all of the following"
-msgstr "��仂亳��从 仗仂 于��亠仄 仗仂仍�礆:"
+msgstr "����从舒���� ��仂于仗舒亟亠仆亳�� 仗仂 于��亠仄 仗仂仍�礆"
 
 #: src/prefs_search_folder.c:231 src/query_search.c:320
-#, fuzzy
 msgid "Folder:"
-msgstr "��舒仗从舒"
+msgstr "��舒仗从舒:"
 
 #: src/prefs_search_folder.c:248 src/query_search.c:338
-#, fuzzy
 msgid "Search subfolders"
-msgstr "��仂亳��从 仆亠 ��亟舒仍����"
+msgstr "����从舒���� 于仂 于仍仂亢亠仆仆���� 仗舒仗从舒��"
 
 #: src/prefs_summary_column.c:70
 msgid "Mark"
@@ -5949,41 +5874,38 @@ msgid "Search messages"
 msgstr "��仂亳��从 ��仂仂弍��亠仆亳亶"
 
 #: src/query_search.c:423
-#, fuzzy
 msgid "_Save as search folder"
-msgstr "弌仂����舒仆亳���� 于 仗舒仗从亠 ��亠��仆仂于亳从仂于"
+msgstr "弌仂����舒仆亳���� 从舒从 仗舒仗从�� 仗仂亳��从舒"
 
 #: src/query_search.c:542 src/subscribedialog.c:526 src/summaryview.c:872
 msgid "Done."
 msgstr "����仗仂仍仆亠仆仂."
 
 #: src/query_search.c:566
-#, fuzzy, c-format
+#, c-format
 msgid "Searching %s ..."
-msgstr "����仂��仄仂���� 仗舒仗从亳 %s ..."
+msgstr "��仂亳��从 于 仗舒仗从亠 \"%s\"..."
 
 #: src/query_search.c:594
-#, fuzzy, c-format
+#, c-format
 msgid "Searching %s (%d / %d)..."
-msgstr "个亳仍������舒��亳��..."
+msgstr "��仂亳��从 于 仗舒仗从亠 \"%s\" (%d / %d)..."
 
 #: src/query_search.c:675 src/summaryview.c:2081
 msgid "(No Date)"
 msgstr "(��亠�� 亟舒����)"
 
 #: src/query_search.c:869
-#, fuzzy
 msgid "Save as search folder"
-msgstr "弌仂����舒仆亳���� 于 仗舒仗从亠 ��亠��仆仂于亳从仂于"
+msgstr "弌仂����舒仆亳���� 从舒从 仗舒仗从�� 仗仂亳��从舒"
 
 #: src/query_search.c:890
 msgid "Location:"
-msgstr ""
+msgstr "��舒亰仄亠��亠仆亳亠:"
 
 #: src/query_search.c:905
-#, fuzzy
 msgid "Folder name:"
-msgstr "��仄�� ��舒亶仍舒"
+msgstr "��仄�� 仗舒仗从亳:"
 
 #: src/rfc2015.c:140
 msgid "Cannot find user ID for this key."
@@ -5992,7 +5914,7 @@ msgstr "��亠 仆舒亶亟亠仆 亳亟亠仆��亳��亳从舒��仂�� 仗仂仍��亰仂于舒��亠仍�� 亟
 #: src/rfc2015.c:151
 #, c-format
 msgid "\t\taka \"%s\"\n"
-msgstr ""
+msgstr "\t亟����亞仂亠 亳仄�� \"%s\"\n"
 
 #: src/rfc2015.c:179
 #, c-format
@@ -6006,12 +5928,12 @@ msgstr "����亳弍从舒 仗��仂于亠��从亳 仗仂亟仗亳��亳"
 #: src/select-keys.c:105
 #, c-format
 msgid "Please select key for `%s'"
-msgstr "����弍亠��亳��亠 从仍�ﾑ� 亟仍�� '%s'"
+msgstr "����弍亠��亳��亠 从仍�ﾑ� 亟仍�� \"%s\""
 
 #: src/select-keys.c:108
 #, c-format
 msgid "Collecting info for `%s' ... %c"
-msgstr "弌弍仂�� 亳仆��仂��仄舒��亳亳 仂 '%s' ... %c"
+msgstr "弌弍仂�� 亳仆��仂��仄舒��亳亳 仂 \"%s\" ... %c"
 
 #: src/select-keys.c:291
 msgid "Select Keys"
@@ -6035,7 +5957,7 @@ msgstr "��于亠亟亳��亠 亟����亞仂亶 亳亟亠仆��亳��亳从舒��仂�� 从仍�ﾑ�舒 亳仍亳
 
 #: src/select-keys.c:485
 msgid "Trust key"
-msgstr ""
+msgstr "��仂于亠��亳亠 从仍�ﾑ���"
 
 #: src/select-keys.c:486
 msgid ""
@@ -6044,25 +5966,29 @@ msgid ""
 "know for sure that it will go to the person you mean it to.\n"
 "Do you trust it enough to use it anyway?"
 msgstr ""
+"��亠�� 亟仂于亠��亳�� 于��弍��舒仆仆仂仄�� 从仍�ﾑ���.  ����仍亳 亰舒��亳����仂于舒���� ��仂仂弍��亠仆亳亠\n"
+"����亳仄 从仍�ﾑ�仂仄, 仆亠�� ��于亠��亠仆仆仂����亳, ����仂 仂仆仂 弍��亟亠�� 仗��仂��亳��舒仆仂 亳仄亠仆仆仂\n"
+"��亠仄 ��亠仍仂于亠从仂仄, 从仂��仂����亶 ��从舒亰舒仆 于 User ID 从仍�ﾑ�舒.\n"
+"����仗仂仍��亰仂于舒���� ����仂�� 从仍�ﾑ�, 仆亠��仄仂������ 仆舒 仂������������于亳亠 亟仂于亠��亳��?"
 
 #: src/send_message.c:183
 msgid "Queued message header is broken.\n"
 msgstr "��舒亞仂仍仂于仂从 ��仂仂弍��亠仆亳�� 于 仂��亠��亠亟亳 亳��仗仂����亠仆.\n"
 
 #: src/send_message.c:402
-#, fuzzy, c-format
+#, c-format
 msgid "Sending message using command: %s\n"
-msgstr "����仗��舒于从舒 ��仂仂弍��亠仆亳�� (%d / %d 弍舒亶��)"
+msgstr "����仗��舒于从舒 ��仂仂弍��亠仆亳�� �� 仗仂仄仂������ 从仂仄舒仆亟��: %s\n"
 
 #: src/send_message.c:411
-#, fuzzy, c-format
+#, c-format
 msgid "Can't execute command: %s"
-msgstr "����仗仂仍仆亳���� 从仂仄舒仆亟��"
+msgstr "��亠 ��亟舒仍仂���� 于��仗仂仍仆亳���� 从仂仄舒仆亟��: %s"
 
 #: src/send_message.c:446
-#, fuzzy, c-format
+#, c-format
 msgid "Error occurred while executing command: %s"
-msgstr "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 仗亠��亠亟舒��亠 从仂仄舒仆亟��.\n"
+msgstr "����仂亳亰仂��仍舒 仂��亳弍从舒 仗��亳 于��仗仂仍仆亠仆亳亳 从仂仄舒仆亟��: %s"
 
 #: src/send_message.c:552
 msgid "Connecting"
@@ -6136,19 +6062,16 @@ msgid "Mailbox setting"
 msgstr "丕����舒仆仂于从亳 仗仂����仂于仂亞仂 ����亳从舒"
 
 #: src/setup.c:44
-#, fuzzy
 msgid ""
 "Specify the location of mailbox.\n"
 "If you are unsure, just select OK."
 msgstr ""
 "��舒亟舒亶��亠 仗������ 从 仗仂����仂于仂仄�� ����亳从��.\n"
-"����仍亳 弍��亟亠�� ��从舒亰舒仆 ������亠����于���ﾑ�亳亶 ����亳从, ��仂 仂仆\n"
-"弍��亟亠�� 舒于��仂仄舒��亳��亠��从亳 仗��仂��亳��舒仆."
+"����仍亳 于�� 仆亠 亰仆舒亠��亠, 从舒从仂亶 仗������ 亳��仗仂仍��亰仂于舒����, 仗��仂����仂 仆舒亢仄亳��亠 OK."
 
 #: src/sigstatus.c:116
-#, fuzzy
 msgid "Signature check result"
-msgstr "��仂从舒亰��于舒���� ��亠亰��仍����舒�� 仗��仂于亠��从亳 仗仂亟仗亳��亳 于 仂��亟亠仍��仆仂仄 仂从仆亠"
+msgstr "��亠亰��仍����舒�� 仗��仂于亠��从亳 仗仂亟仗亳��亳"
 
 #: src/sigstatus.c:135
 msgid "Checking signature"
@@ -6175,39 +6098,38 @@ msgstr "丱仂��仂��舒�� 仗仂亟仗亳����"
 #: src/sigstatus.c:241
 #, c-format
 msgid "Valid signature but the key for \"%s\" is not trusted"
-msgstr ""
+msgstr "��仂亟仗亳���� 仂�� \"%s\" 仗��舒于亳仍��仆舒��, 仆仂 仆亠�� 亟仂于亠��亳�� 从仍�ﾑ���"
 
 #: src/sigstatus.c:242 src/textview.c:663
 msgid "Valid signature (untrusted key)"
-msgstr ""
+msgstr "��仂亟仗亳���� 仗��舒于亳仍��仆舒��, 仆仂 仆亠�� 亟仂于亠��亳�� 从仍�ﾑ���"
 
 #: src/sigstatus.c:247
 #, c-format
 msgid "Signature valid but expired for \"%s\""
-msgstr ""
+msgstr "��仂亟仗亳���� 仂�� \"%s\" 仗��舒于亳仍��仆舒��, 仆仂 仗��仂����仂��亠仆舒"
 
 #: src/sigstatus.c:248
-#, fuzzy
 msgid "Signature valid but expired"
-msgstr "��仂亟仗亳���� ��仂亰亟舒仆舒 %s\n"
+msgstr "��仂亟仗亳���� 仗��舒于亳仍��仆舒��, 仆仂 仗��仂����仂��亠仆舒"
 
 #: src/sigstatus.c:251
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has expired"
-msgstr ""
+msgstr "��仂亟仗亳���� 仂�� \"%s\" 仗��舒于亳仍��仆舒��, 仆仂 从仍�ﾑ� 仗��仂����仂��亠仆"
 
 #: src/sigstatus.c:252
 msgid "Signature valid but the signing key has expired"
-msgstr ""
+msgstr "��仂亟仗亳���� 仗��舒于亳仍��仆舒��, 仆仂 从仍�ﾑ� 仗��仂����仂��亠仆"
 
 #: src/sigstatus.c:255
 #, c-format
 msgid "Signature valid but the signing key for \"%s\" has been revoked"
-msgstr ""
+msgstr "��仂亟仗亳���� 仂�� \"%s\" 仗��舒于亳仍��仆舒��, 仆仂 从仍�ﾑ� 弍��仍 仂��仂亰于舒仆"
 
 #: src/sigstatus.c:256
 msgid "Signature valid but the signing key has been revoked"
-msgstr ""
+msgstr "��仂亟仗亳���� 仗��舒于亳仍��仆舒��, 仆仂 从仍�ﾑ� 弍��仍 仂��仂亰于舒仆"
 
 #: src/sigstatus.c:259
 #, c-format
@@ -6277,9 +6199,8 @@ msgid "unknown"
 msgstr "仆亠亳亰于亠����仆��亶"
 
 #: src/subscribedialog.c:481
-#, fuzzy
 msgid "Getting newsgroup list..."
-msgstr "��亠 ��亟舒仍仂���� 仗仂仍����亳���� ��仗亳��仂从 亞����仗仗 仆仂于仂����亠亶."
+msgstr "��仂仍����亠仆亳亠 ��仗亳��从舒 亞����仗仗 仆仂于仂����亠亶..."
 
 #: src/subscribedialog.c:489
 msgid "Can't retrieve newsgroup list."
@@ -6339,9 +6260,8 @@ msgid "/_Mark/Mark as rea_d"
 msgstr "/����仄亠��亳����/��仂仄亠��亳���� 从舒从 仗��仂��亳��舒仆仆仂亠"
 
 #: src/summaryview.c:431
-#, fuzzy
 msgid "/_Mark/Mark _thread as read"
-msgstr "/����仄亠��亳����/��仂仄亠��亳���� 从舒从 仗��仂��亳��舒仆仆仂亠"
+msgstr "/����仄亠��亳����/��仂仄亠��亳���� 仂弍����亢亟亠仆亳亠 从舒从 仗��仂��亳��舒仆仆仂亠"
 
 #: src/summaryview.c:433
 msgid "/_Mark/Mark all _read"
@@ -6356,34 +6276,28 @@ msgid "/Re-_edit"
 msgstr "/��亰仄亠仆亳����"
 
 #: src/summaryview.c:440
-#, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/��仂弍舒于亳���� 仂��仗��舒于亳��亠仍�� 于 舒亟��亠��仆���� 从仆亳亞��"
 
 #: src/summaryview.c:442
-#, fuzzy
 msgid "/Create f_ilter rule"
-msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳"
+msgstr "/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳"
 
 #: src/summaryview.c:443
-#, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
-msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��于��仂仄舒��亳��亠��从亳"
+msgstr "/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��于��仂仄舒��亳��亠��从亳"
 
 #: src/summaryview.c:445
-#, fuzzy
 msgid "/Create f_ilter rule/by _From"
-msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 仂��仗��舒于亳��亠仍��"
+msgstr "/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 仂��仗��舒于亳��亠仍��"
 
 #: src/summaryview.c:447
-#, fuzzy
 msgid "/Create f_ilter rule/by _To"
-msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 仗仂仍����舒��亠仍��"
+msgstr "/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 仗仂仍����舒��亠仍��"
 
 #: src/summaryview.c:449
-#, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
-msgstr "/��仆��������仄亠仆����/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 ��亠仄亠"
+msgstr "/弌仂亰亟舒���� 仗��舒于亳仍仂 ��亳仍������舒��亳亳/��仂 ��亠仄亠"
 
 #: src/summaryview.c:455
 msgid "/_View/_Source"
@@ -6403,26 +6317,23 @@ msgstr "弌仂亰亟舒仆亳亠 仂弍仍舒����亳 仗��仂��仄仂����舒 ��仗亳��从舒...\n"
 
 #: src/summaryview.c:515
 msgid "All"
-msgstr ""
+msgstr "����亠 ��仂仂弍��亠仆亳��"
 
 #: src/summaryview.c:518
-#, fuzzy
 msgid "Have color label"
-msgstr "/����亟亠仍亠仆亳亠 ��于亠��仂仄"
+msgstr "����亟亠仍亠仆仆��亠 ��于亠��仂仄"
 
 #: src/summaryview.c:519
-#, fuzzy
 msgid "Have attachment"
-msgstr "��仍仂亢亠仆亳亠"
+msgstr "弌 于仍仂亢亠仆亳�礆亳"
 
 #: src/summaryview.c:528
-#, fuzzy
 msgid "Search:"
-msgstr "��仂亳��从"
+msgstr "��仂亳��从:"
 
 #: src/summaryview.c:546
 msgid "Search for Subject or From"
-msgstr ""
+msgstr "��仂亳��从 仗仂 ��亠仄亠 亳仍亳 仂��仗��舒于亳��亠仍��"
 
 #: src/summaryview.c:734
 msgid "Process mark"
@@ -6438,7 +6349,6 @@ msgid "Scanning folder (%s)..."
 msgstr "����仂��仄仂���� 仗舒仗从亳 (%s)..."
 
 #: src/summaryview.c:1325
-#, fuzzy
 msgid "_Search again"
 msgstr "����从舒���� ��仆仂于舒"
 
@@ -6578,7 +6488,7 @@ msgstr "弌仂仂弍��亠仆亳亠 %d 仗仂仄亠��亠仆仂 从舒从 仆亠仗��仂��亳��舒仆仆仂亠
 #: src/summaryview.c:3008
 #, c-format
 msgid "Message %s/%d is set to delete\n"
-msgstr "弌仂仂弍��亠仆亳亠 %s/%d 仗仂仄亠��亠仆仂 从舒从 ��亟舒仍亠仆仆仂亠\n"
+msgstr "弌仂仂弍��亠仆亳亠 %s/%d 仗仂仄亠��亠仆仂 从舒从 ��亟舒仍��仆仆仂亠\n"
 
 #: src/summaryview.c:3036
 msgid "Delete message(s)"
@@ -6590,7 +6500,7 @@ msgstr "丕亟舒仍亳���� ��仂仂弍��亠仆亳�� 弍亠亰 于仂亰仄仂亢仆仂����亳 于仂����
 
 #: src/summaryview.c:3111
 msgid "Deleting duplicated messages..."
-msgstr "丕仆亳����仂亢亠仆亳亠 仗仂于��仂�����ﾑ�亳������ ��仂仂弍��亠仆亳亶..."
+msgstr "丕亟舒仍亠仆亳亠 仗仂于��仂�����ﾑ�亳������ ��仂仂弍��亠仆亳亶..."
 
 #: src/summaryview.c:3149
 #, c-format
@@ -6628,9 +6538,9 @@ msgid "Unthreading..."
 msgstr "����仄亠仆舒 ��于�磶��于舒仆亳�� 仂弍����亢亟亠仆亳亶..."
 
 #: src/summaryview.c:4299 src/summaryview.c:4355
-#, fuzzy, c-format
+#, c-format
 msgid "Filtering (%d / %d)..."
-msgstr "个亳仍������舒��亳��..."
+msgstr "个亳仍������舒��亳�� (%d / %d)..."
 
 #: src/summaryview.c:4404
 msgid "filtering..."
@@ -6663,36 +6573,31 @@ msgid "This message can't be displayed.\n"
 msgstr "��亠于仂亰仄仂亢仆仂 仂��仂弍��舒亰亳���� ��仂仂弍��亠仆亳亠.\n"
 
 #: src/textview.c:1925
-#, fuzzy
 msgid "Sa_ve this image as..."
-msgstr "/弌仂����舒仆亳���� 从舒从..."
+msgstr "弌仂����舒仆亳���� 亳亰仂弍��舒亢亠仆亳亠 从舒从..."
 
 #: src/textview.c:1941 src/trayicon.c:114
-#, fuzzy
 msgid "Compose _new message"
 msgstr "��舒仗亳��舒���� 仆仂于仂亠 ��仂仂弍��亠仆亳亠"
 
 #: src/textview.c:1943
-#, fuzzy
 msgid "Add to address _book..."
-msgstr "/��仂弍舒于亳���� 仂��仗��舒于亳��亠仍�� 于 舒亟��亠��仆���� 从仆亳亞��"
+msgstr "��仂弍舒于亳���� 于 舒亟��亠��仆���� 从仆亳亞��"
 
 #: src/textview.c:1945
-#, fuzzy
 msgid "Copy this add_ress"
-msgstr "��亟��亠��舒 仂��亞舒仆亳亰舒��亳亶"
+msgstr "��仂仗亳��仂于舒���� 舒亟��亠��"
 
 #: src/textview.c:1948
-#, fuzzy
 msgid "_Open with Web browser"
-msgstr "Web-弍��舒��亰亠��"
+msgstr "����从�������� 于 弍��舒��亰亠��亠"
 
 #: src/textview.c:1950
 msgid "Copy this _link"
-msgstr ""
+msgstr "��仂仗亳��仂于舒���� ������仍从��"
 
 #: src/textview.c:2093
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "The real URL (%s) is different from\n"
 "the apparent URL (%s).\n"
@@ -6701,355 +6606,42 @@ msgid ""
 msgstr ""
 "��亠亶����于亳��亠仍��仆��亶 URL (%s) 仂��仍亳��舒亠������ 仂��\n"
 "仂��仂弍��舒亢舒亠仄仂亞仂 URL (%s).\n"
-"����亠 ��舒于仆仂 仂��从��������?"
+"\n"
+"������ ��舒于仆仂 仂��从��������?"
 
 #: src/textview.c:2098
 msgid "Fake URL warning"
-msgstr ""
+msgstr "��仆亳仄舒仆亳亠 - 仗仂亟仄亠仆舒 URL"
 
 #: src/trayicon.c:100
-#, fuzzy
 msgid "Get from _current account"
-msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/��仂仍����亳���� �� ��亠从����亠亶 ����亠��仆仂亶 亰舒仗亳��亳"
+msgstr "��仂仍����亳���� 仗仂������ �� ��亠从����亠亶 ��������仆仂亶 亰舒仗亳��亳"
 
 #: src/trayicon.c:104
-#, fuzzy
 msgid "Get from _all accounts"
-msgstr "/弌仂仂弍��亠仆亳亠/��仂仍����亳����/��仂仍����亳���� ��仂 于��亠�� ����亠��仆���� 亰舒仗亳��亠亶"
+msgstr "��仂仍����亳���� 仗仂������ ��仂 于��亠�� ��������仆���� 亰舒仗亳��亠亶"
 
 #: src/trayicon.c:108
-#, fuzzy
 msgid "_Send queued messages"
-msgstr "��仂��仍舒���� ��仂仂弍��亠仆亳�� 亳亰 仂��亠��亠亟亳"
+msgstr "����仗��舒于亳���� ��仂仂弍��亠仆亳�� 亳亰 仂��亠��亠亟亳"
 
 #: src/trayicon.c:120
-#, fuzzy
 msgid "_About"
 msgstr "�� 仗��仂亞��舒仄仄亠"
 
 #: src/trayicon.c:124
-#, fuzzy
 msgid "E_xit"
 msgstr "������仂亟"
 
 #: src/trayicon.c:139
-#, fuzzy
 msgid "Sylpheed"
-msgstr "弌��舒��舒�� Sylpheed"
-
-#~ msgid "MIME viewer command line is invalid: `%s'"
-#~ msgstr "��亠于亠��仆舒�� 从仂仄舒仆亟舒 仗��仂��仄仂����舒 MIME: '%s'"
-
-#~ msgid "%dB"
-#~ msgstr "%d 弍"
-
-#~ msgid "%.1fKB"
-#~ msgstr "%.1f 从弍"
-
-#~ msgid "%.2fMB"
-#~ msgstr "%.2f ��弍"
-
-#~ msgid "%.2fGB"
-#~ msgstr "%.2f ��弍"
-
-#~ msgid "Wrap before sending"
-#~ msgstr "��亠��亠仆仂��亳���� 仗亠��亠亟 仂��仗��舒于从仂亶"
-
-#~ msgid "Insert signature"
-#~ msgstr "��仂弍舒于亳���� 仗仂亟仗亳����"
-
-#~ msgid "can't retrieve newsgroup list\n"
-#~ msgstr "仂��亳弍从舒 仗仂仍����亠仆亳�� ��仗亳��从舒 亞����仗仗 仆仂于仂����亠亶\n"
-
-#, fuzzy
-#~ msgid "%s - Search folder properties"
-#~ msgstr "弌于仂亶����于舒 仗舒仗从亳"
-
-#~ msgid "Body:"
-#~ msgstr "丐亠从���� ��仂仂弍��亠仆亳��:"
-
-#~ msgid "Beginning of list reached; continue from end?"
-#~ msgstr "��仂����亳亞仆����仂 仆舒��舒仍仂 ��仗亳��从舒; 仗��仂亟仂仍亢亳���� �� 从仂仆��舒?"
-
-#~ msgid "End of list reached; continue from beginning?"
-#~ msgstr "��仂����亳亞仆���� 从仂仆亠�� ��仗亳��从舒; 仗��仂亟仂仍亢亳���� �� 仆舒��舒仍舒?"
-
-#, fuzzy
-#~ msgid "Outgoing encoding"
-#~ msgstr "��仂亟亳��仂于从舒 仂��仗��舒于仍�磳仄���� ��仂仂弍��亠仆亳亶"
-
-#~ msgid "Quote"
-#~ msgstr "丶亳��亳��仂于舒仆亳亠"
-
-#~ msgid "Font"
-#~ msgstr "丿��亳����"
-
-#~ msgid " [Edited]"
-#~ msgstr " [��亰仄亠仆亠仆仂]"
-
-#, fuzzy
-#~ msgid "Fallback encoding"
-#~ msgstr "��仂亟亳��仂于从舒 仂��仗��舒于仍�磳仄���� ��仂仂弍��亠仆亳亶"
-
-#~ msgid "Terminated process group id: %d"
-#~ msgstr "��舒于亠����亠仆 仗��仂��亠���� 亞����仗仗��: %d"
-
-#~ msgid "Temporary file: %s"
-#~ msgstr "����亠仄亠仆仆��亶 ��舒亶仍: %s"
-
-#~ msgid "Compose: input from monitoring process\n"
-#~ msgstr "��仂亟亞仂��仂于从舒 ��仂仂弍��亠仆亳��: 于于仂亟 亳亰 仗��仂��亠����舒 ��仍亠亢亠仆亳��\n"
-
-#~ msgid "Couldn't exec external editor\n"
-#~ msgstr "��亠 ��亟舒仍仂���� 亰舒仗������亳���� 于仆亠��仆亳亶 ��亠亟舒从��仂��\n"
-
-#~ msgid "Couldn't write to file\n"
-#~ msgstr "����亳弍从舒 亰舒仗亳��亳 于 ��舒亶仍\n"
-
-#~ msgid "Pipe read failed\n"
-#~ msgstr "����亳弍从舒 ����亠仆亳�� 亳亰 从舒仆舒仍舒\n"
-
-#, fuzzy
-#~ msgid ""
-#~ "Filtered messages will be moved to the junk folder and deleted from the "
-#~ "server."
-#~ msgstr "(��亠仂����亳仍������仂于舒仆仆��亠 ��仂仂弍��亠仆亳�� 弍��亟���� ��仂����舒仆亠仆�� 于 ����仂亶 仗舒仗从亠)"
-
-#~ msgid ""
-#~ "Enter the print command line:\n"
-#~ "(`%s' will be replaced with file name)"
-#~ msgstr ""
-#~ "��于亠亟亳��亠 从仂仄舒仆亟�� 仗亠��舒��亳:\n"
-#~ "('%s' 弍��亟亠�� 亰舒仄亠仆亠仆仂 仆舒 亳仄�� ��舒亶仍舒)"
-
-#~ msgid ""
-#~ "First, you have to set the location of mailbox.\n"
-#~ "You can use existing mailbox in MH format\n"
-#~ "if you have the one.\n"
-#~ "If you're not sure, just select OK."
-#~ msgstr ""
-#~ "��仆舒��舒仍亠 ��从舒亢亳��亠 仄亠����仂仆舒��仂亢亟亠仆亳亠 仗仂����仂于仂亞仂 ����亳从舒.\n"
-#~ "���� 仄仂亢亠��亠 亳��仗仂仍��亰仂于舒���� ������亠����于���ﾑ�亳亶 ����亳从 于 ��仂��仄舒��亠 MH,\n"
-#~ "亠��仍亳 �� 于舒�� 亠������ ��舒从仂于仂亶.\n"
-#~ "����仍亳 仆亠 ��于亠��亠仆��, ��仂 仗��仂����仂 仆舒亢仄亳��亠 OK."
-
-#~ msgid ""
-#~ "Select the preset of key bindings.\n"
-#~ "You can also modify each menu's shortcuts by pressing\n"
-#~ "any key(s) when placing the mouse pointer on the item."
-#~ msgstr ""
-#~ "����弍亠��亳��亠 仂亟仆�� 亳亰 ����舒仆亟舒����仆���� 仆舒������仂亠从 亟仍�� 从仍舒于亳舒������仆���� 从仂仄舒仆亟.\n"
-#~ "丼��仂弍�� 仆舒亰仆舒��亳���� 亳仍亳 亳亰仄亠仆亳���� 从仂仄弍亳仆舒��亳�� 从仍舒于亳�� 亟仍�� 从仂仄舒仆亟�� 仄亠仆��,\n"
-#~ "仆舒亢仄亳��亠 ������ 从仍舒于亳���� (亳仍亳 从仂仄弍亳仆舒��亳�� 从仍舒于亳��), ������舒仆仂于亳于 ��从舒亰舒��亠仍��\n"
-#~ "仆舒 仆��亢仆���� 从仂仄舒仆亟�� 于 仄亠仆��."
-
-#~ msgid "Compose message%s"
-#~ msgstr "��仂亟亞仂��仂于从舒 ��仂仂弍��亠仆亳��%s"
-
-#~ msgid "Translate header name (such as `From:', `Subject:')"
-#~ msgstr "��亠��亠于仂亟亳���� 亳仄亠仆舒 亰舒亞仂仍仂于从仂于 ('From:', 'Subject:')"
-
-#~ msgid "Font selection"
-#~ msgstr "����弍仂�� ����亳����舒"
-
-#~ msgid "Empty messages in all trash?"
-#~ msgstr "丕亟舒仍亳���� 于��亠 ��仂仂弍��亠仆亳�� 亳亰 于��亠�� 从仂��亰亳仆?"
-
-#~ msgid "Yes"
-#~ msgstr "��舒"
-
-#~ msgid "+No"
-#~ msgstr "+��亠��"
-
-#~ msgid "Discard message"
-#~ msgstr "����从舒亰 仂�� ��仂仂弍��亠仆亳��"
-
-#~ msgid "Discard"
-#~ msgstr "����从舒亰舒��������"
-
-#~ msgid "to Draft"
-#~ msgstr "�� ��亠��仆仂于亳从亳"
-
-#~ msgid "can't write headers\n"
-#~ msgstr "仂��亳弍从舒 亰舒仗亳��亳 亰舒亞仂仍仂于从仂于\n"
-
-#~ msgid "External program"
-#~ msgstr "��仆亠��仆���� 仗��仂亞��舒仄仄舒"
-
-#~ msgid "Local spool"
-#~ msgstr "��仂从舒仍��仆��亶 ��仗��仍"
-
-#~ msgid "Sending queued message %d failed.\n"
-#~ msgstr "����亳弍从舒 仗��亳 仂��仗��舒于从亠 ��仂仂弍��亠仆亳�� %d 亳亰 仂��亠��亠亟亳.\n"
-
-#~ msgid "Backward search"
-#~ msgstr "��弍��舒��仆��亶 仗仂亳��从"
-
-#~ msgid "Select all matched"
-#~ msgstr "����弍��舒���� 于��亠 于��仂亢亟亠仆亳��"
-
-#~ msgid "M"
-#~ msgstr "��"
-
-#~ msgid "U"
-#~ msgstr "丼"
-
-#~ msgid "Selecting all messages..."
-#~ msgstr "����弍亳��舒�ﾑ����� 于��亠 ��仂仂弍��亠仆亳��..."
-
-#~ msgid "Unthreading for execution..."
-#~ msgstr "����仄亠仆舒 ��于�磶��于舒仆亳�� 仂弍����亢亟亠仆亳�� 亟仍�� 亳��仗仂仍仆亠仆亳��..."
-
-#~ msgid "/_Edit/A_dvanced"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂"
-
-#~ msgid "/_Edit/A_dvanced/Move a character backward"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/��亠��亠亶��亳 仆舒 ��亳仄于仂仍 仆舒亰舒亟"
-
-#~ msgid "/_Edit/A_dvanced/Move a character forward"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/��亠��亠亶��亳 仆舒 ��亳仄于仂仍 于仗亠��亠亟"
-
-#~ msgid "/_Edit/A_dvanced/Move a word backward"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/��亠��亠亶��亳 仆舒 ��仍仂于仂 仆舒亰舒亟"
-
-#~ msgid "/_Edit/A_dvanced/Move a word forward"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/��亠��亠亶��亳 仆舒 ��仍仂于仂 于仗亠��亠亟"
-
-#~ msgid "/_Edit/A_dvanced/Move to beginning of line"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/��亠��亠亶��亳 于 仆舒��舒仍仂 ������仂从亳"
-
-#~ msgid "/_Edit/A_dvanced/Move to end of line"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/��亠��亠亶��亳 于 从仂仆亠�� ������仂从亳"
-
-#~ msgid "/_Edit/A_dvanced/Move to previous line"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/��亠��亠亶��亳 从 仗��亠亟��亟����亠亶 ������仂从亠"
-
-#~ msgid "/_Edit/A_dvanced/Move to next line"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/��亠��亠亶��亳 从 ��仍亠亟���ﾑ�亠亶 ������仂从亠"
-
-#~ msgid "/_Edit/A_dvanced/Delete a character backward"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/丕亟舒仍亳���� ��亳仄于仂仍 仗亠��亠亟 从������仂��仂仄"
-
-#~ msgid "/_Edit/A_dvanced/Delete a character forward"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/丕亟舒仍亳���� ��亳仄于仂仍 仗仂��仍亠 从������仂��舒"
-
-#~ msgid "/_Edit/A_dvanced/Delete a word backward"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/丕亟舒仍亳���� 仗��亠亟��亟����亠亠 ��仍仂于仂"
-
-#~ msgid "/_Edit/A_dvanced/Delete a word forward"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/丕亟舒仍亳���� ��仍亠亟���ﾑ�亠亠 ��仍仂于仂"
-
-#~ msgid "/_Edit/A_dvanced/Delete line"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/丕亟舒仍亳���� ������仂从��"
-
-#~ msgid "/_Edit/A_dvanced/Delete to end of line"
-#~ msgstr "/����舒于从舒/��仂仗仂仍仆亳��亠仍��仆仂/丕亟舒仍亳���� 亟仂 从仂仆��舒 ������仂从亳"
-
-#~ msgid "Rebuilding all folder trees..."
-#~ msgstr "��亠��亠������仂亶从舒 于��亠�� 亟亠��亠于��亠于 仗舒仗仂从 ..."
-
-#~ msgid "/_View/_Code set/---"
-#~ msgstr "/��亳亟/��仂亟亳��仂于从舒/---"
-
-#~ msgid "/_View/_Code set"
-#~ msgstr "/��亳亟/��仂亟亳��仂于从舒"
-
-#~ msgid "To save this part, pop up the context menu with "
-#~ msgstr "丼��仂弍�� ��仂����舒仆亳���� ������ ��舒������, 于��亰仂于亳��亠 从仂仆��亠从����仆仂亠 仄亠仆��, "
-
-#~ msgid "right click and select `Save as...', "
-#~ msgstr "��亠仍从仆��于 仗��舒于仂亶 从仆仂仗从仂亶 仄����亳, 亳 于��弍亠��亳��亠 '弌仂����舒仆亳���� 从舒从...', "
-
-#~ msgid "To display this part as a text message, select "
-#~ msgstr "��仍�� 仂��仂弍��舒亢亠仆亳�� ����仂亞仂 于仍仂亢亠仆亳�� 从舒从 ��亠从����舒 于��弍亠��亳��亠 "
-
-#~ msgid ""
-#~ "`Display as text', or press `t' key.\n"
-#~ "\n"
-#~ msgstr ""
-#~ "'��仂从舒亰舒���� 从舒从 ��亠从����', 亳仍亳 仆舒亢仄亳��亠 从仍舒于亳���� 't'.\n"
-#~ "\n"
-
-#~ msgid "To open this part with external program, select "
-#~ msgstr "��仍�� 仂��从������亳�� ����仂亞仂 于仍仂亢亠仆亳�� 于仆亠��仆亠亶 仗��仂亞��舒仄仄仂亶 于��弍亠��亳��亠 "
-
-#~ msgid "`Open' or `Open with...', "
-#~ msgstr "'����从��������' 亳仍亳 '����从�������� �� 仗仂仄仂������...', "
-
-#~ msgid "or double-click, or click the center button, "
-#~ msgstr "亳仍亳 ��亠仍从仆亳��亠 亟于舒亢亟��, 亳仍亳 ��亠仍从仆亳��亠 ����亠亟仆亠亶 从仆仂仗从仂亶 仄����亳, "
-
-#~ msgid "or press `l' key."
-#~ msgstr "亳仍亳 仆舒亢仄亳��亠 从仍舒于亳���� 'l'."
-
-#~ msgid "To check it, pop up the context menu with\n"
-#~ msgstr "丼��仂弍�� 仗��仂于亠��亳���� 亠亠, 于��亰仂于亳��亠 从仂仆��亠从����仆仂亠 仄亠仆��, ��亠仍从仆��于 仗��舒于仂亶\n"
-
-#~ msgid "right click and select `Check signature'.\n"
-#~ msgstr "从仆仂仗从仂亶 仄����亳, 亳 于��弍亠��亳��亠 '����仂于亠��亳���� 仗仂亟仗亳����'.\n"
-
-#~ msgid "Top"
-#~ msgstr "�� 仆舒��舒仍仂"
-
-#~ msgid "Bottom"
-#~ msgstr "�� 从仂仆亠��"
-
-#~ msgid "Copy"
-#~ msgstr "��仂仗亳��仂于舒����"
-
-#~ msgid "OK"
-#~ msgstr "OK"
-
-#~ msgid "Close"
-#~ msgstr "��舒从��������"
-
-#~ msgid "Cancel"
-#~ msgstr "����仄亠仆亳����"
-
-#~ msgid "No"
-#~ msgstr "��亠��"
-
-#~ msgid "Refresh"
-#~ msgstr "��弍仆仂于亳����"
-
-#~ msgid "Apply"
-#~ msgstr "����亳仄亠仆亳����"
-
-#~ msgid "Oops: Signature not verified"
-#~ msgstr "Oops: ��仂亟仗亳���� 仆亠 仗��仂于亠��亠仆舒"
-
-#~ msgid "Different results for signatures"
-#~ msgstr "��舒亰仆��亠 ��亠亰��仍����舒���� 仗��仂于亠��从亳 仗仂亟仗亳��亠亶"
-
-#~ msgid "Error: Unknown status"
-#~ msgstr "����亳弍从舒: ��亠亳亰于亠����仆��亶 ����舒������"
-
-#~ msgid "                aka \"%s\"\n"
-#~ msgstr "        亟����亞仂亠 亳仄�� \"%s\"\n"
-
-#~ msgid "Key fingerprint: %s\n"
-#~ msgstr "����仗亠��舒��仂从 从仍�ﾑ�舒: %s\n"
-
-#~ msgid "Found label: %s\n"
-#~ msgstr "��舒亶亟亠仆舒 仄亠��从舒: %s\n"
-
-#~ msgid "Reading configuration...\n"
-#~ msgstr "丼��亠仆亳亠 从仂仆��亳亞����舒��亳亳...\n"
-
-#~ msgid "Finished reading configuration.\n"
-#~ msgstr "丼��亠仆亳亠 从仂仆��亳亞����舒��亳亳 亰舒于亠����亠仆仂.\n"
-
-#~ msgid "Leave space on head"
-#~ msgstr "������舒于仍������ 仄亠����仂 于 亰舒亞仂仍仂于从亠"
-
-#~ msgid "Abcdef"
-#~ msgstr "Abcdef"
-
-#~ msgid "JPilot charset"
-#~ msgstr "��仂亟亳��仂于从舒 JPilot"
+msgstr "Sylpheed"
 
 #~ msgid "can't lock %s with fcntl\n"
 #~ msgstr "仆亠 ��亟舒仍仂���� 亰舒弍仍仂从亳��仂于舒���� %s �� 仗仂仄仂������ fcntl\n"
 
 #~ msgid "can't lock %s with flock\n"
 #~ msgstr "仆亠 ��亟舒仍仂���� 亰舒弍仍仂从亳��仂于舒���� %s �� 仗仂仄仂������ flock\n"
+
+#~ msgid "JPilot charset"
+#~ msgstr "��仂亟亳��仂于从舒 JPilot"
diff --git a/po/sk.po b/po/sk.po
index b54d050d..d37c359e 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -512,16 +512,16 @@ msgstr "Prie��inok"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Nepodarilo sa skonvertova泥 k坦d.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "nem担転em otvori泥 s炭bor so zna��kami\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ned叩 sa prija泥 spr叩va %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Pr鱈kazov箪 riadok tla��e je neplatn箪: '%s'\n"
@@ -943,10 +943,10 @@ msgid "/New _Folder"
 msgstr "/Nov箪 _Prie��inok"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1024,7 +1024,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Odstr叩ni泥 prie��inok"
 
@@ -1159,7 +1159,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Prie��inok"
@@ -1247,8 +1247,8 @@ msgstr "/_Prida泥..."
 msgid "/_Remove"
 msgstr "/_Odstr叩ni泥"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Vlastnosti..."
 
@@ -2043,12 +2043,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nov箪 prie��inok"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Zadajte n叩zov nov辿ho prie��inka:"
 
@@ -2217,178 +2217,183 @@ msgstr "Spoolovac鱈 prie��inok"
 msgid "Select folder"
 msgstr "Zvo直te prie��inok"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prijat辿"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odoslan辿"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Odpadkov箪 k担邸"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "Nov箪 Prie��inok"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ned叩 sa vytvori泥 prie��inok `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Vytvori泥 _nov箪 prie��inok..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Premenova泥 prie��inok..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/_Premenova泥 prie��inok..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Zmaza泥 prie��inok"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Vypr叩zdni泥 k担邸"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/P_rija泥 nov辿 spr叩vy"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/O_bnovi泥 邸trukt炭ru prie��inkov"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Zobrazi泥/_Aktualizova泥 zoznam"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/Oz_na��i泥/Ozna��i泥 ako _pre��鱈tan辿"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/Vy_h直ada泥 v spr叩vach..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "貼iadne nepre��鱈tan辿 spr叩vy."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prih_l叩si泥 sa do diskusnej skupiny"
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Odstr叩ni泥 _diskusn炭 skupinu"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Vytv叩ram n叩h直ad pre prie��inok...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nov箪"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Nepre��鱈tan辿"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Nastavujem inform叩cie o prie��inku...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Nastavujem inform叩cie o prie��inku..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preh直ad叩vam prie��inok %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preh直ad叩vam prie��inok %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Obnovi泥 strom prie��inkov"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Strom prie��inkov bude obnoven箪. Pokra��ova泥?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Obnovujem strom prie��inku..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Obnova stromu prie��inku sa nepodarila."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Kontrolujem nov辿 spr叩by vo v邸etk箪ch prie��inkoch..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Prie��inok %s je zvolen箪\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam spr叩vu..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielan鱈 spr叩vy na %s nastala chyba."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2398,26 +2403,26 @@ msgstr ""
 "(Ak chcete vytvori泥 prie��inok s ��al邸鱈mi podzlo転kami,\n"
 "pridajte na koniec n叩zvu '/')"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nov箪 n叩zov pre `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Premenova泥 prie��inok"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Prie��inok '%s' sa ned叩 odstr叩ni泥."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Prie��inok '%s' sa ned叩 odstr叩ni泥."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2426,12 +2431,12 @@ msgstr ""
 "Naozaj chcete odstr叩ni泥 schr叩nku '%s' ?\n"
 "(Spr叩vy NEBUD�� odstr叩nen辿 z disku)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstr叩ni泥 prie��inok"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2442,21 +2447,21 @@ msgstr ""
 "V邸etky prie��inky a spr叩vy v `%s' bud炭 odstr叩nen辿.\n"
 "Naozaj pokra��ova泥?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Prie��inok '%s' sa ned叩 odstr叩ni泥."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Vypr叩zdni泥 k担邸"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmaza泥 v邸etky spr叩vy v ko邸i?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2465,34 +2470,34 @@ msgstr ""
 "Naozaj chcete odstr叩ni泥 schr叩nku '%s' ?\n"
 "(Spr叩vy NEBUD�� odstr叩nen辿 z disku)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Odstr叩ni泥 schr叩nku"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstr叩ni泥 IMAP4 konto '%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Odstr叩ni泥 IMAP4 konto"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstr叩ni泥 diskusn炭 skupinu '%s'?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Odstr叩ni泥 diskusn炭 skupinu"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstr叩ni泥 news konto '%s'?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Odstr叩ni泥 news konto"
 
diff --git a/po/sl.po b/po/sl.po
index 6b23b738..b815a51f 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -517,16 +517,16 @@ msgstr "Mapa"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Pretvorba kodiranja ni uspela.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "Ne morem odpreti datoteke z oznakami.\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne morem prenesti sporo��ila %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Ukazna vrstica za tiskanje ni veljavna: `%s'\n"
@@ -949,10 +949,10 @@ msgid "/New _Folder"
 msgstr "/Nova _mapa"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1030,7 +1030,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Izbri邸i mapo"
 
@@ -1164,7 +1164,7 @@ msgid "Group"
 msgstr "Skupina"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapa"
@@ -1252,8 +1252,8 @@ msgstr "/_Dodaj"
 msgid "/_Remove"
 msgstr "/_Odstrani"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Lastnost..."
@@ -2048,12 +2048,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2221,179 +2221,184 @@ msgstr "Imenik spool"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "��akajo��e"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Naredi _novo mapo..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj mapo..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/I_zbri邸i mapo..."
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Preveri nova sporo��ila"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/Ponovno z_gradi drevo map"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pogled/_Posodobi povzetek"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/_Oznaka/Ozna��i kot _prebrano"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_Iskanje sporo��il..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "Ni neprebranih sporo��il."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Vpis na novi��arsko skupino..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_Odstrani skupino novic"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Delam mapo View...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Neprebrano"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Nastavljam informacije o mapi...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Nastavljam informacije o mapi..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Preiskujem mapo %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Preiskujem mapo %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Ponovno zgradi drevo map"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Ponovno gradim drevo map..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Preverjam nova sporo��ila v vseh mapah..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Po邸iljam sporo��ilo"
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, 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:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2403,26 +2408,26 @@ msgstr ""
 "(��e 転elite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2431,12 +2436,12 @@ msgstr ""
 "Ali naj res odstranim po邸tni predal '%s' ?\n"
 "(Sporo��ila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbri邸i mapo"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2447,21 +2452,21 @@ msgstr ""
 "Vse mape in sporo��ila pod '%s' bodo izbrisana.\n"
 "Ali jih res 転elite izbrisati?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbri邸em vsa sporo��ila v smetnjaku?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2470,34 +2475,34 @@ msgstr ""
 "Ali naj res odstranim po邸tni predal '%s' ?\n"
 "(Sporo��ila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Odstrani po邸tni predal"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbri邸em ra��un IMAP4 '%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Izbri邸i ra��un IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbri邸em novi��arsko skupino '%s'?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Izbri邸i novi��arsko skupino"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbri邸em novi��arski ra��un '%s'?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Izbri邸i novi��arski ra��un"
 
diff --git a/po/sr.po b/po/sr.po
index 19551e1c..48e1568c 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -518,16 +518,16 @@ msgstr "Direktorijum"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Promena koda nije uspjela.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "ne mogu otvoriti obele転enu datoteku\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "ne mogu dohvatiti poruku %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Naredba za 邸tampanje nije dobra: `%s'\n"
@@ -949,10 +949,10 @@ msgid "/New _Folder"
 msgstr "/Novi _direktorijum"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1031,7 +1031,7 @@ msgstr ""
 "Ako bri邸ete samo direktorijum, adrese ��e biti preme邸tene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Obri邸i direktorijum"
 
@@ -1158,7 +1158,7 @@ msgid "Group"
 msgstr "Grupa"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Direktorijum"
@@ -1246,8 +1246,8 @@ msgstr "/_Dodaj..."
 msgid "/_Remove"
 msgstr "/_Skloni"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 #, fuzzy
 msgid "/_Properties..."
 msgstr "/_Svojstva..."
@@ -2043,12 +2043,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2216,179 +2216,184 @@ msgstr "Spool direktorijum"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sandu��e"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odlo転eno"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Sme��e"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nedovr邸eno"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Kreiraj _novi direktorijum..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/P_reimenuj direktorijum..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Obri邸i direktorijum"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 #, fuzzy
 msgid "/Empty _trash"
 msgstr "Isprazni sme��e"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Proveri ima li novih poruka"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/Osv_e転i stablo direktorijuma"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Pregled/_Osve転i rezime"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "/_Ozna��i/Ozna��i kao _pro��itano"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_Tra転i poruke..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 #, fuzzy
 msgid "/Down_load"
 msgstr "Nema nepro��itanih poruka."
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prijavi se na _news grupu..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/Skloni news _grupu"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Stvaram pregled za direktorijum...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Novo"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Nepro��itano"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Postavljam info direktorijuma...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Postavljam info direktorijuma..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "Pretra転ujem direktorijume %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "Pretra転ujem direktorijum %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "/O_sve転i stablo direktorijuma"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr ""
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Osve転avam stablo direktorijuma..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 #, fuzzy
 msgid "Rebuilding of the folder tree failed."
 msgstr "Osve転avam stablo direktorijuma..."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Proveravanje novih poruka u svim direktorijumima..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��aljem poruku"
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, 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:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2398,26 +2403,26 @@ msgstr ""
 "(ukoliko 転elite napraviti direktorijum za sme邸tanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2426,12 +2431,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NE��E biti obrisane sa diska)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obri邸i direktorijum"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2442,21 +2447,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' bi��e obrisane.\n"
 "貼elite li ih zaista obrisati?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "Isprazni sme��e"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz sme��a?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2465,34 +2470,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NE��E biti obrisane sa diska)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandu��e"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Obri邸i IMAP4 nalog"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Obri邸i news grupu"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Obri邸i news nalog"
 
diff --git a/po/sv.po b/po/sv.po
index 5ce4dc7e..02fc4e83 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -514,16 +514,16 @@ msgstr "Skr辰ppostfilter"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kodkonvertering misslyckades.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "kan inte 旦ppna markeringsfil\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kan inte h辰mta meddelande %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Utskriftskommando 辰r felaktigt: \"%s\"\n"
@@ -946,10 +946,10 @@ msgid "/New _Folder"
 msgstr "/Ny _mapp"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1028,7 +1028,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -1155,7 +1155,7 @@ msgid "Group"
 msgstr "Grupp"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Mapp"
@@ -1243,8 +1243,8 @@ msgstr "/_L辰gg till..."
 msgid "/_Remove"
 msgstr "/_Ta bort"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/_Egenskaper..."
 
@@ -2002,12 +2002,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet p奪 den nya mappen:"
 
@@ -2174,175 +2174,180 @@ msgstr "V辰lj katalog"
 msgid "Select folder"
 msgstr "V辰lj mapp"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "K旦"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/_Ny mapp..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/_Byt namn..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/_Flytta..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Ta bort"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/T旦m _papperskorgen"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/Ta emot nya _meddelanden"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/_Uppdatera mapptr辰d"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_Visa/_Uppdatera summering"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Markera som l辰st"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_S旦k meddelanden..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/_H辰mta"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/Prenumerera p奪 _diskussionsgrupp"
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/T_a bort diskussionsgrupp"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Skapar mappvy...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Nya"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Ol辰sta"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "St辰ller in mappinfo...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "St辰ller in mappinfo..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "S旦ker igenom mapp %s%c%s..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "S旦ker igenom mapp %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Uppdatera mapptr辰d"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Mapptr辰det kommer att uppdateras. Forts辰tt?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Uppdaterar mapptr辰d..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Uppdatering av mapptr辰det misslyckades."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Letar efter nya meddelanden i alla mappar..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "Skr辰p"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s 辰r vald\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2352,26 +2357,26 @@ msgstr ""
 "(om du vill skapa en mapp som skall inneh奪lla undermappar,\n"
 " l辰gg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn p奪 \"%s\":"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Byt namn p奪 mapp"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2380,12 +2385,12 @@ msgstr ""
 "Vill du verkligen ta bort brevl奪dan \"%s\" ?\n"
 "(Meddelandena tas INTE bort fr奪n disken)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2398,20 +2403,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "T旦m papperskorgen"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2420,34 +2425,34 @@ msgstr ""
 "Vill du verkligen ta bort brevl奪dan \"%s\" ?\n"
 "(Meddelandena tas INTE bort fr奪n disken)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Ta bort brevl奪da"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
diff --git a/po/tr.po b/po/tr.po
index b7494f41..07e84b78 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -516,16 +516,16 @@ msgstr "dizin:"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Kod 巽evriminde hata.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "i��aret dosyas脹 a巽脹lamad脹\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "%d. ileti al脹namad脹\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "Yazd脹rma komutu ge巽ersiz: `%s'\n"
@@ -946,10 +946,10 @@ msgid "/New _Folder"
 msgstr "/Yeni _Dizin"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1028,7 +1028,7 @@ msgstr ""
 "misiniz?\n"
 "E��er sadece dizini silerseniz, i巽indeki adresler ana dizine ta��脹nacakt脹r."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1160,7 +1160,7 @@ msgid "Group"
 msgstr "Grup"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Dizin"
@@ -1248,8 +1248,8 @@ msgstr "/_Ekle..."
 msgid "/_Remove"
 msgstr "/_Sil"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/��_zellikler..."
 
@@ -2036,12 +2036,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin ad脹n脹 verin:"
 
@@ -2209,176 +2209,181 @@ msgstr "Dizini se巽"
 msgid "Select folder"
 msgstr "Dizini se巽"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "G旦nderilen"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "��旦p"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini olu��turulam脹yor."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/Yeni _dizin yarat..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/D_izinin ad脹n脹 de��i��tir"
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/D_izinin ad脹n脹 de��i��tir"
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/Dizini _sil"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/��旦_p端 bo��alt"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/Y_eni iletileri al"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/Dizin a��ac脹n脹 _yeniden yarat"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/_G旦r端n端m/_G旦r端n端m端 g端ncelle"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "Okunmu�� olarak i��aretle"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/聴_letilerda ara..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/聴_ndir"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/_Haber grubuna 端ye ol..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/H_aber grubunu sil"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "Dizin g旦r端nt端s端 olu��turuluyor...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "Yeni"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Okunmam脹��"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Dizin bilgisi ayarlan脹yor...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Dizin bilgisi ayarlan脹yor..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "%s%c%s dizini taran脹yor..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "%s dizini taran脹yor..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "Dizin a��ac脹n脹 yeniden tara"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "Dizin a��ac脹 yeniden olu��turulacak. Devam edilsin mi?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "Dizin a��ac脹 yeniden yarat脹l脹yor..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Dizin a��ac脹 yeniden olu��turulamad脹."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini se巽ildi\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "聴letiler %s i巽ine indiriliyor..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "聴letiler `%s' i巽ine indirilirken hata olu��tu."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2388,26 +2393,26 @@ msgstr ""
 "(E��er alt dizin i巽erecek bir dizin olu��turmak \n"
 "istiyorsan脹z, ad脹n脹n sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' i巽in yeni bir isim verin:"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "Dizini yeniden adland脹r"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2416,12 +2421,12 @@ msgstr ""
 "`%s' posta kutusu kald脹r脹ls脹n m脹?\n"
 "(聴letiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2432,21 +2437,21 @@ msgstr ""
 "`%s' alt脹ndaki t端m dizinler ve mesajlar silinecek.\n"
 "Devam etmek istedi��inizden emin misiniz?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "��旦p端 bo��alt"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "��旦pteki t端m iletiler silinsin mi?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2455,34 +2460,34 @@ msgstr ""
 "`%s' posta kutusu kald脹r脹ls脹n m脹?\n"
 "(聴letiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesab脹 silinsin mi?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesab脹n脹 sil"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesab脹 silinsin mi?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Haber grubu hesab脹n脹 sil"
 
diff --git a/po/uk.po b/po/uk.po
index 08a40872..f0598605 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -521,16 +521,16 @@ msgstr "����仍������ 仄仂��仍仂����"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): ��亠��亠��于仂��亠仆仆�� 从仂亟��于 仆亠 于亟舒仍仂����.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "仆亠 于亟舒仍仂���� 于��亟从��亳��亳 ��舒亶仍 仗仂亰仆舒��仂从\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "仆亠 于亟舒仍仂���� �����磪��亳 仍亳���� %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "��亠于����仆舒 从仂仄舒仆亟舒 亟����从��: `%s'\n"
@@ -950,10 +950,10 @@ msgid "/New _Folder"
 msgstr "/��仂于舒 仗舒仗从舒"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1031,7 +1031,7 @@ msgstr ""
 "丼亳 弍舒亢舒����亠 ��亳 于亳亟舒仍亳��亳 仗舒仗从�� 丐�� 于���� 舒亟��亠��亳 于 `%s' ? \n"
 "亊从��仂 于亳亟舒仍亳��亳 ����仍��从亳 仗舒仗从��, 舒亟��亠��亳 弍��亟亠 仗亠��亠仆亠��亠仆仂 于 仂��仂仗仍�ﾑﾑ��� 仗舒仗从��."
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "��亳亟舒仍亳��亳 仗舒仗从��"
 
@@ -1157,7 +1157,7 @@ msgid "Group"
 msgstr "������仗舒"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "��舒仗从舒"
@@ -1245,8 +1245,8 @@ msgstr "/��仂亟舒��亳..."
 msgid "/_Remove"
 msgstr "/��亳亟舒仍亳��亳"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/��仍舒����亳于仂������..."
 
@@ -1996,12 +1996,12 @@ msgstr "��亠亟舒亞��于舒��亳 仗舒仗从��"
 msgid "Input the new name of folder:"
 msgstr "��于亠亟������ 仆仂于�� 仆舒亰于�� 仗舒仗从亳:"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��仂于舒 仗舒仗从舒"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "��于亠亟������ 仆舒亰于�� 仆仂于仂�� 仗舒仗从亳:"
 
@@ -2168,174 +2168,179 @@ msgstr "��弍��舒��亳 仗舒仗从��"
 msgid "Select folder"
 msgstr "��弍��舒��亳 仗舒仗从��"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "������亟仆��"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "����亟����仍舒仆��"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "丼亠��亞舒"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "��仂��亳从"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "丼亠��仆亠��从亳"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "��仂于舒��舒仗从舒"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' 仆亠 仄仂亢亠 仄������亳��亳���� 于 仆舒亰于�� 仗舒仗从亳."
 
-#: src/foldersel.c:564 src/folderview.c:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "��舒仗从舒 `%s' 于亢亠 ����仆����."
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "��亠 于亟舒仍仂���� ����于仂��亳��亳 仗舒仗从�� `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/弌��于仂��亳��亳 仆仂于�� 仗舒仗从��..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/��亠��亠亶仄亠仆��于舒��亳 仗舒仗从��..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/��亠��亠仆亠����亳 仗舒仗从��..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/��亳亟舒仍亳��亳 仗舒仗从��"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/弌仗仂��仂亢仆亳��亳 从仂��亳从"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/��亠��亠于����亳��亳 亰舒 仆仂于亳仄亳 仍亳����舒仄亳"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/��亠��亠弍��亟��于舒��亳 亟亠��亠于仂 仗舒仗仂从"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/��仆仂于亳��亳 ��仗亳��仂从"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "��仂亰仆舒��亳��亳 �磻 仗��仂��亳��舒仆亠"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/丿��从舒��亳 仍亳����亳..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr "/��亠亟舒亞��于舒��亳 ��仄仂于亳 仗仂����从��..."
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/��舒于舒仆��舒亢亳��亳"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/��亠��亠亟仗仍舒��亳��亳 从仂仆��亠��亠仆������"
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/��亳亟舒仍亳��亳 从仂仆��亠��亠仆������"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "弌��于仂��亠仆仆�� 仂弍仍舒������ 仗亠��亠亞仍�磲�� 仗舒仗仂从...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "��仂于��"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "��亠仗��仂��亳��舒仆��"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "������舒仆仂于仍�ﾑ�仄仂 ��仆��仂��仄舒������ 仗舒仗从亳...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "������舒仆仂于仍�ﾑ�仄仂 ��仆��仂��仄舒������ 仗舒仗从亳..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "��亠��亠��亳������仄仂 仗舒仗从�� %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "��亠��亠��亳������仄仂 仗舒仗从�� %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "��亠��亠弍��亟��于舒��亳 亟亠��亠于仂 仗舒仗仂从"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "��亠��亠于仂 仗舒仗仂从 弍��亟亠 仗亠��亠弍��亟仂于舒仆仂. ����仂亟仂于亢亳��亳?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "��亠��亠弍��亟仂于����仄仂 亟亠��亠于仂 仗舒仗仂从..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "��亠 于亟舒仍仂���� 仗亠��亠弍��亟��于舒��亳 亟亠��亠于仂 仗舒仗仂从."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "��亠��亠于����亳��亳 亰舒 仆仂于亳仄亳 仍亳����舒仄亳 �� 于������ 仗舒仗从舒��..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "��仂��仍仂��"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "��舒仗从�� %s 仂弍��舒仆仂\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��舒于舒仆��舒亢����仄仂 仍亳����亳 �� %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "丐��舒仗亳仍舒���� 仗仂仄亳仍从舒 仗��亳 亰舒于舒仆��舒亢亠仆仆�� 仍亳������于 �� `%s'."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2345,26 +2350,26 @@ msgstr ""
 "(�磻��仂 弍舒亢舒����亠 ����于仂��亳��亳 仗舒仗从��, �磻舒 仄������亳���� 仗��亟仗舒仗从亳,\n"
 " 亟仂亟舒亶��亠 `/' 于 从��仆���� 仆舒亰于亳)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "��于亠亟������ 仆仂于�� 仆舒亰于�� 亟仍�� `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "��亠��亠亶仄亠仆��于舒��亳 仗舒仗从��"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "��亠 于亟舒仍仂���� 仗亠��亠亶仄亠仆��于舒��亳 仗舒仗从�� `%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "��亠 于亟舒仍仂���� 仗亠��亠仆亠����亳 仗舒仗从�� `%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2373,11 +2378,11 @@ msgstr ""
 "弌仗��舒于亟�� 于亳亟舒仍亳��亳 仗舒仗从�� 仗仂����从�� `%s' ?\n"
 "(��亳����亳 ���� 于亳亟舒仍���ﾑ������� 亰 亟亳��从舒.)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "��亳亟舒仍亳��亳 仗舒仗从�� 仗仂����从��"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2390,20 +2395,20 @@ msgstr ""
 "\n"
 "弌仗��舒于亟�� 弍舒亢舒����亠 于亳亟舒仍亳��亳?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "��亠 于亟舒仍仂���� 于亳亟舒仍亳��亳 仗舒仗从�� `%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "弌仗仂��仂亢仆亳��亳 从仂��亳从"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "��亳亟舒仍亳��亳 于���� 仍亳����亳 亰 从仂��亳从舒?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2412,34 +2417,34 @@ msgstr ""
 "弌仗��舒于亟�� 于亳亟舒仍亳��亳 ��从��亳仆��从�� `%s' ?\n"
 "(��亳����亳 ���� 于亳亟舒仍���ﾑ������� 亰 亟亳��从舒)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "��亳亟舒仍亳��亳 ��从��亳仆��从��"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "弌仗��舒于亟�� 于亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳�� IMAP4 `%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "��亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳�� IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "����亶��仆仂 于亳亟舒仍亳��亳 从仂仆��亠��亠仆������ `%s'?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "��亳亟舒仍亳��亳 从仂仆��亠��亠仆������"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "����亶��仆仂 于亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳�� 从仂仆��亠��亠仆������ `%s'?"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "��亳亟舒仍亳��亳 仂弍仍��从仂于亳亶 亰舒仗亳�� 从仂仆��亠��亠仆������"
 
diff --git a/po/vi.po b/po/vi.po
index 5a7bc417..c6c83ccd 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -512,16 +512,16 @@ msgstr "L畛�c th動 r叩c"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): Chuy畛�n ��畛�i m達 th畉�t b畉�i.\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "kh担ng th畛� m畛� t畉�p tin ��叩nh d畉�u\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "kh担ng th畛� l畉�y th動 %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "L畛�nh in kh担ng h畛�p l畛�: `%s'\n"
@@ -927,10 +927,10 @@ msgid "/New _Folder"
 msgstr "/Th動 _m畛�c m畛�i"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1008,7 +1008,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:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "Xo叩 th動 m畛�c"
 
@@ -1138,7 +1138,7 @@ msgid "Group"
 msgstr "Nh坦m"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "Th動 m畛�c"
@@ -1226,8 +1226,8 @@ msgstr "/Th棚_m..."
 msgid "/_Remove"
 msgstr "/_Xo叩 b畛�"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/Th_u畛�c t鱈nh"
 
@@ -1977,12 +1977,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:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "Th動 m畛�c m畛�i"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "��畉�t t棚n cho th動 m畛�c m畛�i:"
 
@@ -2149,174 +2149,179 @@ msgstr "Ch畛�n th動 m畛�c"
 msgid "Select folder"
 msgstr "Ch畛�n th動 m畛�c"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "H畛�p nh畉�n"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "��達 g畛�i"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "��畛�i g畛�i"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Th湛ng r叩c"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nh叩p"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "Th動 m畛�c m畛�i"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, 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:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: 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:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kh担ng t畉�o ��動畛�c th動 m畛�c `%s'."
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/T畉�o th動 m畛�c _m畛�i..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/��畛�i _t棚n th動 m畛�c..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/_Di chuy畛�n th動 m畛�c..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/_Xo叩 th動 m畛�c"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/��畛� _r叩c"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/_Ki畛�m tra th動 m畛�i"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/_L��m l畉�i c但y th動 m畛�c"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 msgid "/_Update summary"
 msgstr "/_C畉�p nh畉�t t坦m t畉�t"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "��叩nh d畉�u l�� ��達 ��畛�c"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/_T狸m th動..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/T畉�i _v畛�"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/����ng k鱈 v��o _nh坦m tin..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/_Xo叩 nh坦m tin"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "��ang t畉�o khung th動 m畛�c...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "M畛�i"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "Ch動a ��畛�c"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "Thi畉�t l畉�p th担ng tin th動 m畛�c...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "Thi畉�t l畉�p th担ng tin th動 m畛�c..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "��ang qu辿t th動 m畛�c %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "��ang qu辿t th動 m畛�c %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "L��m l畉�i c但y th動 m畛�c"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "C但y th動 m畛�c s畉� ��動畛�c l��m l畉�i. Ti畉�p t畛�c?"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "��ang l��m l畉�i c但y th動 m畛�c..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "Vi畛�c l��m l畉�i c但y th動 m畛�c th畉�t b畉�i."
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "Ki畛�m tra th動 m畛�i trong m畛�i th動 m畛�c..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "R叩c"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Th動 m畛�c %s ��動畛�c ch畛�n\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "��ang t畉�i th動 v畛� trong %s ..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "C坦 l畛�i khi t畉�i th動 v畛� trong `%s'."
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2326,26 +2331,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:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "��畉�t t棚n cho `%s':"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "��畛�i t棚n th動 m畛�c"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kh担ng th畛� ��畛�i t棚n th動 m畛�c `%s'."
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kh担ng th畛� di chuy畛�n th動 m畛�c `%s'."
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2354,11 +2359,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:2367
+#: src/folderview.c:2394
 msgid "Delete search folder"
 msgstr "Xo叩 th動 m畛�c t狸m ki畉�m"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2371,20 +2376,20 @@ msgstr ""
 "\n"
 "B畉�n c坦 th畛�c s畛� mu畛�n xo叩 kh担ng?"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kh担ng th畛� xo叩 th動 m畛�c '%s'."
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "��畛�i r叩c"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "Xo叩 m畛�i th動 trong th湛ng r叩c?"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2393,34 +2398,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:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "Xo叩 h畛�p th動"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Th畛�c s畛� mu畛�n xo叩 t��i kho畉�n IMAP4 `%s'?"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "Xo叩 t��i kho畉�n IMAP4"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Th畛�c s畛� mu畛�n xo叩 nh坦m tin `%s'?"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "Xo叩 nh坦m tin"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, 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:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "Xo叩 t��i kho畉�n tin t畛�c"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 91bbe976..4a7743e5 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -511,16 +511,16 @@ msgstr "���篁九す鐚�"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content()鐚�篁ｇ��莉���√け茣ャ��\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "���羈����綣����莅井��篁�\n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "���羈��ｷ������篁� %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "�����医�巡擦茵�������鐚����%s���\n"
@@ -940,10 +940,10 @@ msgid "/New _Folder"
 msgstr "/��医産���篁九す(_F)"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1021,7 +1021,7 @@ msgstr ""
 "���荀������も��%s���筝�������篁九す�����������医�����鐚�\n"
 "絋����篁������ゆ��篁九す鐚���医��絨�茴�腱糸�遺��筝�膾ф��篁九す筝����"
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "�����ゆ��篁九す"
 
@@ -1146,7 +1146,7 @@ msgid "Group"
 msgstr "臂ょ��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "���篁九す"
@@ -1234,8 +1234,8 @@ msgstr "/羞糸��(_A)..."
 msgid "/_Remove"
 msgstr "/������(_R)"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/絮����(_P)..."
 
@@ -1998,12 +1998,12 @@ msgstr "膽�莨����篁九す"
 msgid "Input the new name of folder:"
 msgstr "莨���ユ��篁九す�����医��絖�鐚�"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��医産���篁九す"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "莨���ユ�医産���篁九す������絖�鐚�"
 
@@ -2171,176 +2171,181 @@ msgstr "���篁倶�����綵�"
 msgid "Select folder"
 msgstr "���������篁九す"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "��銀散膊�"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "綏峨�����"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "������"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "綺�篁句��"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "���腮睡��"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "��井��篁九す"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "絖�膃����%c���筝���遵�����������篁九す���絖�筝����"
 
-#: src/foldersel.c:564 src/folderview.c:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "���篁九す���%s���綏峨��������"
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "���羈����綮堺��篁九す���%s������"
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/���綮堺�井��篁九す(_N)..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/�����遵�����篁九す(_R)..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 #, fuzzy
 msgid "/_Move folder..."
 msgstr "/�����遵�����篁九す(_R)..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/�����ゆ��篁九す(_D)"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/羝�腥阪��篁句��(_T)"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/罍���ユ�育��篁�(_C)"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/���綮堺��篁九す���(_E)"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/��ョ��(_V)/��贋�井��荀�(_U)"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "���莅遺減綏画��"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/��ユ�冗��篁�(_S)..."
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/筝�莉�(_L)"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/莅∫����育�紫��(_B)..."
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/�����ゆ�育�紫��(_R)"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "罩ｅ�����綮堺��篁九す茹����...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "��医産"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "���莚�"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "罩ｅ��莅丞舟���篁九す篆≧��...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "罩ｅ��莅丞舟���篁九す篆≧��..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "罩ｅ�����������篁九す %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "罩ｅ�����������篁九す %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "���綮堺��篁九す���"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "���篁九す���絨����綮冴��膸х鮫���鐚�"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "罩ｅ�����綮堺��篁九す���..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "���綮堺��篁九す���紊沿乾���"
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "罩ｅ��罍���ユ��������篁九す筝������育��篁�..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "���筝����篁九す %s\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "罩ｅ��筝�莉� %s 筝�������篁�..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "筝�莉盾��%s���筝�������篁倶�九��������莚����"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2350,26 +2355,26 @@ msgstr ""
 "(絋�������荀����綮坂��筝�篆�絖�絖����篁九す������篁九す鐚�\n"
 "������絖����������羞糸�����/���)"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "莨���モ��%s��������医��絖�鐚�"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "�����遵�����篁銀散"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "���羈������ゆ��篁九す���%s������"
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "���羈������ゆ��篁九す���%s������"
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2378,12 +2383,12 @@ msgstr ""
 "������荀������ら��篁句�奄��%s���鐚�\n"
 "(���篁銀��篌�篁�脾����������)"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "�����ゆ��篁九す"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2394,21 +2399,21 @@ msgstr ""
 "���%s���筝�������������篁九す������篁九��茴������ゃ��\n"
 "���������荀������ゅ��鐚�"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "���羈������ゆ��篁九す���%s������"
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "羝�腥阪��篁句��"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "羝�腥阪��篁句�演�����������篆＞散鐚�"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2417,34 +2422,34 @@ msgstr ""
 "������荀������ら��篁句�奄��%s���鐚�\n"
 "(���篁銀��篌�篁�脾����������)"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "�����ら��膊�"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "������荀������� IMAP4 絽��垨��%s���鐚�"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "������ IMAP4 絽����"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "������荀������ゆ�育�紫�����%s���鐚�"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "�����ゆ�育�紫��"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "�����域�������ゆ�育�紫��絽��垨��%s���鐚�"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "�����ゆ�育�紫��絽����"
 
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 11b13894..4e825c01 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-09 16:52+0900\n"
+"POT-Creation-Date: 2006-06-16 16:49+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"
@@ -515,16 +515,16 @@ msgstr "�����冗�灸散莖����紊�"
 msgid "procmime_get_text_content(): Code conversion failed.\n"
 msgstr "procmime_get_text_content(): 莉�腆弱け������\n"
 
-#: libsylph/procmsg.c:620
+#: libsylph/procmsg.c:654
 msgid "can't open mark file\n"
 msgstr "��≧��������罔�腓榊��罟�罅� \n"
 
-#: libsylph/procmsg.c:1072
+#: libsylph/procmsg.c:1106
 #, c-format
 msgid "can't fetch message %d\n"
 msgstr "��≧����桁����灸散 %d\n"
 
-#: libsylph/procmsg.c:1378
+#: libsylph/procmsg.c:1412
 #, c-format
 msgid "Print command line is invalid: `%s'\n"
 msgstr "�����医�巡擦���茯わ�����%s���\n"
@@ -943,10 +943,10 @@ msgid "/New _Folder"
 msgstr "/��医��莖����紊�(_F)"
 
 #: src/addressbook.c:384 src/addressbook.c:394 src/compose.c:513
-#: src/folderview.c:246 src/folderview.c:248 src/folderview.c:253
-#: src/folderview.c:266 src/folderview.c:268 src/folderview.c:270
-#: src/folderview.c:275 src/folderview.c:289 src/folderview.c:291
-#: src/folderview.c:295 src/summaryview.c:416 src/summaryview.c:420
+#: src/folderview.c:250 src/folderview.c:252 src/folderview.c:258
+#: src/folderview.c:271 src/folderview.c:273 src/folderview.c:275
+#: src/folderview.c:281 src/folderview.c:295 src/folderview.c:297
+#: src/folderview.c:302 src/summaryview.c:416 src/summaryview.c:420
 #: src/summaryview.c:423 src/summaryview.c:435 src/summaryview.c:437
 #: src/summaryview.c:439 src/summaryview.c:451 src/summaryview.c:457
 msgid "/---"
@@ -1024,7 +1024,7 @@ msgstr ""
 "���腆阪��荀������ゃ��%s���莖����紊鞘札���茖♂�∽����������医�����鐚�\n"
 "絋���������御���Û����よ�����紊常��茖♂�∝�����荐�膣����絨�腱糸�遺��筝�絮よ�����紊鞘賢���"
 
-#: src/addressbook.c:1672 src/folderview.c:2375
+#: src/addressbook.c:1672 src/folderview.c:2402
 msgid "Delete folder"
 msgstr "�����よ�����紊�"
 
@@ -1151,7 +1151,7 @@ msgid "Group"
 msgstr "臂ょ��"
 
 #. special folder setting (maybe these options are redundant)
-#: src/addressbook.c:3160 src/folderview.c:367 src/prefs_account_dialog.c:1694
+#: src/addressbook.c:3160 src/folderview.c:374 src/prefs_account_dialog.c:1694
 #: src/query_search.c:398
 msgid "Folder"
 msgstr "莖����紊�"
@@ -1239,8 +1239,8 @@ msgstr "/��医��(_A)..."
 msgid "/_Remove"
 msgstr "/������(_R)"
 
-#: src/compose.c:514 src/folderview.c:257 src/folderview.c:279
-#: src/folderview.c:299
+#: src/compose.c:514 src/folderview.c:262 src/folderview.c:285
+#: src/folderview.c:306
 msgid "/_Properties..."
 msgstr "/��у��(_P)..."
 
@@ -1996,12 +1996,12 @@ msgstr "膩�莠�莖����紊�"
 msgid "Input the new name of folder:"
 msgstr "茫�莠後�ユ�亥��莖����紊上��腮縁��"
 
-#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2124
-#: src/folderview.c:2130
+#: src/editgroup.c:524 src/foldersel.c:544 src/folderview.c:2151
+#: src/folderview.c:2157
 msgid "New folder"
 msgstr "��域�����紊�"
 
-#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2131
+#: src/editgroup.c:525 src/foldersel.c:545 src/folderview.c:2158
 msgid "Input the name of new folder:"
 msgstr "茫�莠後�ユ�域�����紊丞�����腮縁��"
 
@@ -2168,175 +2168,180 @@ msgstr "��御��������"
 msgid "Select folder"
 msgstr "��御��莖����紊�"
 
-#: src/foldersel.c:360 src/folderview.c:1189 src/prefs_folder_item.c:235
+#: src/foldersel.c:360 src/folderview.c:1196 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "��銀散紊�"
 
-#: src/foldersel.c:364 src/folderview.c:1195 src/prefs_folder_item.c:236
+#: src/foldersel.c:364 src/folderview.c:1202 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "絲�篁九ぞ"
 
-#: src/foldersel.c:368 src/folderview.c:1201 src/prefs_folder_item.c:238
+#: src/foldersel.c:368 src/folderview.c:1208 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "���絖�莖����紊�"
 
-#: src/foldersel.c:372 src/folderview.c:1207 src/prefs_folder_item.c:239
+#: src/foldersel.c:372 src/folderview.c:1214 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "�����ょ����灸散"
 
-#: src/foldersel.c:376 src/folderview.c:1213 src/prefs_folder_item.c:237
+#: src/foldersel.c:376 src/folderview.c:1220 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "���腮�"
 
-#: src/foldersel.c:546 src/folderview.c:2128 src/folderview.c:2132
+#: src/foldersel.c:546 src/folderview.c:2155 src/folderview.c:2159
 msgid "NewFolder"
 msgstr "��域�����紊�"
 
-#: src/foldersel.c:554 src/folderview.c:2140 src/folderview.c:2201
+#: src/foldersel.c:554 src/folderview.c:2167 src/folderview.c:2228
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "莖����紊上��腮延賢筝�������������%c���������絖�������"
 
-#: src/foldersel.c:564 src/folderview.c:2150 src/folderview.c:2209
+#: src/foldersel.c:564 src/folderview.c:2177 src/folderview.c:2236
 #: src/query_search.c:1031
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "莖����紊障��%s���綏峨��������"
 
-#: src/foldersel.c:572 src/folderview.c:2157
+#: src/foldersel.c:572 src/folderview.c:2184
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "��≧��綮榊��莖����紊障��%s������"
 
-#: src/folderview.c:242 src/folderview.c:262
+#: src/folderview.c:246 src/folderview.c:267
 msgid "/Create _new folder..."
 msgstr "/��∝����亥��莖����紊�(_N)..."
 
-#: src/folderview.c:243 src/folderview.c:263 src/folderview.c:287
+#: src/folderview.c:247 src/folderview.c:268 src/folderview.c:293
 msgid "/_Rename folder..."
 msgstr "/�����医�遵��莖����紊�(_R)..."
 
-#: src/folderview.c:244 src/folderview.c:264
+#: src/folderview.c:248 src/folderview.c:269
 msgid "/_Move folder..."
 msgstr "/腱脂�よ�����紊�(_M)..."
 
-#: src/folderview.c:245 src/folderview.c:265 src/folderview.c:288
+#: src/folderview.c:249 src/folderview.c:270 src/folderview.c:294
 msgid "/_Delete folder"
 msgstr "/�����よ�����紊�(_D)"
 
-#: src/folderview.c:247 src/folderview.c:267
+#: src/folderview.c:251 src/folderview.c:272
 msgid "/Empty _trash"
 msgstr "/羝�腥阪����ょ����灸散(_T)"
 
-#: src/folderview.c:249 src/folderview.c:271 src/folderview.c:292
+#: src/folderview.c:253 src/folderview.c:276 src/folderview.c:298
 msgid "/_Check for new messages"
 msgstr "/罟∽�ユ�育�灸散(_C)"
 
-#: src/folderview.c:251 src/folderview.c:273
+#: src/folderview.c:255 src/folderview.c:278
 msgid "/R_ebuild folder tree"
 msgstr "/���綮肴�����紊丞��罕�(_E)"
 
-#: src/folderview.c:252 src/folderview.c:274 src/folderview.c:294
+#: src/folderview.c:256 src/folderview.c:279 src/folderview.c:300
 #, fuzzy
 msgid "/_Update summary"
 msgstr "/蕁�腓�(_V)/��贋�育�灸散���茵�(_U)"
 
-#: src/folderview.c:254 src/folderview.c:276 src/folderview.c:296
+#: src/folderview.c:257 src/folderview.c:280 src/folderview.c:301
+#, fuzzy
+msgid "/Mar_k all read"
+msgstr "罔�荐����綏画��"
+
+#: src/folderview.c:259 src/folderview.c:282 src/folderview.c:303
 msgid "/_Search messages..."
 msgstr "/絨���冗�灸散(_S)"
 
-#: src/folderview.c:255 src/folderview.c:277 src/folderview.c:297
+#: src/folderview.c:260 src/folderview.c:283 src/folderview.c:304
 msgid "/Ed_it search condition..."
 msgstr ""
 
-#: src/folderview.c:269 src/folderview.c:290
+#: src/folderview.c:274 src/folderview.c:296
 msgid "/Down_load"
 msgstr "/筝�莠�(_L)"
 
-#: src/folderview.c:284
+#: src/folderview.c:290
 msgid "/Su_bscribe to newsgroup..."
 msgstr "/���荐���域��臂ょ��(_B)"
 
-#: src/folderview.c:286
+#: src/folderview.c:292
 msgid "/_Remove newsgroup"
 msgstr "/腱脂�ゆ�域��臂ょ��(_R)"
 
-#: src/folderview.c:320
+#: src/folderview.c:327
 msgid "Creating folder view...\n"
 msgstr "��∝��莖����紊丈�∵��...\n"
 
-#: src/folderview.c:397
+#: src/folderview.c:404
 msgid "New"
 msgstr "��亥��"
 
 #. S_COL_MARK
-#: src/folderview.c:411 src/prefs_filter_edit.c:500
+#: src/folderview.c:418 src/prefs_filter_edit.c:500
 #: src/prefs_summary_column.c:71 src/summaryview.c:516
 msgid "Unread"
 msgstr "���莅����"
 
-#: src/folderview.c:425
+#: src/folderview.c:432
 msgid "#"
 msgstr "#"
 
-#: src/folderview.c:556
+#: src/folderview.c:563
 msgid "Setting folder info...\n"
 msgstr "荐�絎�莖����紊�...\n"
 
-#: src/folderview.c:557
+#: src/folderview.c:564
 msgid "Setting folder info..."
 msgstr "荐�絎�莖����紊�..."
 
-#: src/folderview.c:857 src/mainwindow.c:3620 src/setup.c:80
+#: src/folderview.c:864 src/mainwindow.c:3620 src/setup.c:80
 #, c-format
 msgid "Scanning folder %s%c%s ..."
 msgstr "�����顚����紊� %s%c%s ..."
 
-#: src/folderview.c:861 src/mainwindow.c:3625 src/setup.c:85
+#: src/folderview.c:868 src/mainwindow.c:3625 src/setup.c:85
 #, c-format
 msgid "Scanning folder %s ..."
 msgstr "�����顚����紊� %s ..."
 
-#: src/folderview.c:903
+#: src/folderview.c:910
 msgid "Rebuild folder tree"
 msgstr "���綮肴�����紊丞��罕�"
 
-#: src/folderview.c:904
+#: src/folderview.c:911
 msgid "The folder tree will be rebuilt. Continue?"
 msgstr "羣�������綮肴�����紊障��腆阪��荀�膵主��鐚�"
 
-#: src/folderview.c:913
+#: src/folderview.c:920
 msgid "Rebuilding folder tree..."
 msgstr "���綮肴�����紊丞��罕�筝�..."
 
-#: src/folderview.c:920
+#: src/folderview.c:927
 msgid "Rebuilding of the folder tree failed."
 msgstr "���綮肴�����紊丞��罕�紊掩�����"
 
-#: src/folderview.c:1053
+#: src/folderview.c:1060
 msgid "Checking for new messages in all folders..."
 msgstr "罟∽�ユ�����莖����紊鞘賢�����育�灸散..."
 
-#: src/folderview.c:1221 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
+#: src/folderview.c:1228 src/mainwindow.c:2435 src/prefs_common_dialog.c:1819
 msgid "Junk"
 msgstr "�����冗�灸散"
 
-#: src/folderview.c:1872
+#: src/folderview.c:1882
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "綏臥�後�� %s 莖����紊�\n"
 
-#: src/folderview.c:2027
+#: src/folderview.c:2037
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "緇� %s 筝�莠���灸散筝�..."
 
-#: src/folderview.c:2064
+#: src/folderview.c:2074
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "緇� %s 筝�莠���灸散�����榊憥��茯ゃ��"
 
-#: src/folderview.c:2125
+#: src/folderview.c:2152
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2346,26 +2351,26 @@ msgstr ""
 "鐚���ユ��莖����紊鞘��荀����絖�莖����紊常��\n"
 "���茫����莖����紊上��腮援��緇���√��筝����/'鐚�"
 
-#: src/folderview.c:2189
+#: src/folderview.c:2216
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "茫�莠後�ャ��%s��������医��腮縁��"
 
-#: src/folderview.c:2190
+#: src/folderview.c:2217
 msgid "Rename folder"
 msgstr "�����医�遵��莖����紊�"
 
-#: src/folderview.c:2221 src/folderview.c:2229
+#: src/folderview.c:2248 src/folderview.c:2256
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "��≧��腱脂�よ�����紊障��%s������"
 
-#: src/folderview.c:2299
+#: src/folderview.c:2326
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "��≧��腱糸��莖����紊障��%s������"
 
-#: src/folderview.c:2365
+#: src/folderview.c:2392
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2374,12 +2379,12 @@ msgstr ""
 "腆阪��荀�腱脂�や拭膊� %s鐚�\n"
 "羈����鐚�篆∞�延賢�����灸散絨�筝����緇�隋�腆�筝�茴������ゃ��"
 
-#: src/folderview.c:2367
+#: src/folderview.c:2394
 #, fuzzy
 msgid "Delete search folder"
 msgstr "�����よ�����紊�"
 
-#: src/folderview.c:2372
+#: src/folderview.c:2399
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2392,20 +2397,20 @@ msgstr ""
 "\n"
 "���腆阪��荀������ゅ�����鐚�"
 
-#: src/folderview.c:2404 src/folderview.c:2410
+#: src/folderview.c:2431 src/folderview.c:2437
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "��≧��腱脂�よ�����紊障��%s������"
 
-#: src/folderview.c:2446
+#: src/folderview.c:2473
 msgid "Empty trash"
 msgstr "羝�腥阪����ょ����灸散"
 
-#: src/folderview.c:2447
+#: src/folderview.c:2474
 msgid "Delete all messages in the trash folder?"
 msgstr "���腆阪��荀�羝���ゆ�����茴������ょ����灸散鐚�"
 
-#: src/folderview.c:2486
+#: src/folderview.c:2513
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2414,34 +2419,34 @@ msgstr ""
 "腆阪��荀�腱脂�や拭膊� %s鐚�\n"
 "羈����鐚�篆∞�延賢�����灸散絨�筝����緇�隋�腆�筝�茴������ゃ��"
 
-#: src/folderview.c:2488
+#: src/folderview.c:2515
 msgid "Remove mailbox"
 msgstr "腱脂�や拭膊�"
 
-#: src/folderview.c:2538
+#: src/folderview.c:2565
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "���腆阪��荀������� %s ������ IMAP4 絽活��鐚�"
 
-#: src/folderview.c:2539
+#: src/folderview.c:2566
 msgid "Delete IMAP4 account"
 msgstr "������ IMAP4 絽活��"
 
-#: src/folderview.c:2692
+#: src/folderview.c:2719
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "���腆阪��荀������ゆ�域��臂ょ�����%s������鐚�"
 
-#: src/folderview.c:2693
+#: src/folderview.c:2720
 msgid "Delete newsgroup"
 msgstr "�����ゆ�域��臂ょ��"
 
-#: src/folderview.c:2743
+#: src/folderview.c:2770
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "���腆阪��荀������ゆ�域��臂ょ��絽活�����%s������鐚�"
 
-#: src/folderview.c:2744
+#: src/folderview.c:2771
 msgid "Delete news account"
 msgstr "�����ゅ験���"
 
diff --git a/src/folderview.c b/src/folderview.c
index bc9c3117..44c4c442 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -172,6 +172,10 @@ static void folderview_update_summary_cb(FolderView	*folderview,
 					 guint		 action,
 					 GtkWidget	*widget);
 
+static void folderview_mark_all_read_cb	(FolderView	*folderview,
+					 guint		 action,
+					 GtkWidget	*widget);
+
 static void folderview_new_folder_cb	(FolderView	*folderview,
 					 guint		 action,
 					 GtkWidget	*widget);
@@ -250,6 +254,7 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
 					NULL, folderview_update_tree_cb, 0, NULL},
 	{N_("/R_ebuild folder tree"),	NULL, folderview_update_tree_cb, 1, NULL},
 	{N_("/_Update summary"),	NULL, folderview_update_summary_cb, 0, NULL},
+	{N_("/Mar_k all read"),		NULL, folderview_mark_all_read_cb, 0, NULL},
 	{N_("/---"),			NULL, NULL, 0, "<Separator>"},
 	{N_("/_Search messages..."),	NULL, folderview_search_cb, 0, NULL},
 	{N_("/Ed_it search condition..."),
@@ -272,6 +277,7 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
 					NULL, folderview_update_tree_cb, 0, NULL},
 	{N_("/R_ebuild folder tree"),	NULL, folderview_update_tree_cb, 1, NULL},
 	{N_("/_Update summary"),	NULL, folderview_update_summary_cb, 0, NULL},
+	{N_("/Mar_k all read"),		NULL, folderview_mark_all_read_cb, 0, NULL},
 	{N_("/---"),			NULL, NULL, 0, "<Separator>"},
 	{N_("/_Search messages..."),	NULL, folderview_search_cb, 0, NULL},
 	{N_("/Ed_it search condition..."),
@@ -292,6 +298,7 @@ static GtkItemFactoryEntry folderview_news_popup_entries[] =
 	{N_("/_Check for new messages"),
 					NULL, folderview_update_tree_cb, 0, NULL},
 	{N_("/_Update summary"),	NULL, folderview_update_summary_cb, 0, NULL},
+	{N_("/Mar_k all read"),		NULL, folderview_mark_all_read_cb, 0, NULL},
 	{N_("/---"),			NULL, NULL, 0, "<Separator>"},
 	{N_("/_Search messages..."),	NULL, folderview_search_cb, 0, NULL},
 	{N_("/Ed_it search condition..."),
@@ -1592,6 +1599,7 @@ static gboolean folderview_menu_popup(FolderView *folderview,
 	gboolean download_msg    = FALSE;
 	gboolean update_tree     = FALSE;
 	gboolean update_summary  = FALSE;
+	gboolean mark_all_read   = FALSE;
 	gboolean rescan_tree     = FALSE;
 	gboolean remove_tree     = FALSE;
 	gboolean search_folder   = FALSE;
@@ -1621,6 +1629,7 @@ static gboolean folderview_menu_popup(FolderView *folderview,
 			if (gtkut_tree_row_reference_equal
 				(folderview->selected, folderview->opened))
 				update_summary = TRUE;
+			mark_all_read = TRUE;
 		}
 		if (FOLDER_IS_LOCAL(folder) || FOLDER_TYPE(folder) == F_IMAP) {
 			if (item->parent == NULL)
@@ -1692,6 +1701,7 @@ static gboolean folderview_menu_popup(FolderView *folderview,
 	SET_SENS(ifactory, "/Check for new messages", update_tree);
 	SET_SENS(ifactory, "/Rebuild folder tree", rescan_tree);
 	SET_SENS(ifactory, "/Update summary", update_summary);
+	SET_SENS(ifactory, "/Mark all read", mark_all_read);
 	SET_SENS(ifactory, "/Search messages...", search_folder);
 	SET_SENS(ifactory, "/Edit search condition...", search_folder);
 	SET_SENS(ifactory, "/Properties...", folder_property);
@@ -2101,6 +2111,23 @@ static void folderview_update_summary_cb(FolderView *folderview, guint action,
 		     folderview->summaryview->folder_item, TRUE);
 }
 
+static void folderview_mark_all_read_cb(FolderView *folderview, guint action,
+					GtkWidget *widget)
+{
+	FolderItem *item;
+
+	item = folderview_get_selected_item(folderview);
+	if (!item)
+		return;
+
+	if (item == folderview->summaryview->folder_item)
+		summary_mark_all_read(folderview->summaryview);
+	else {
+		procmsg_mark_all_read(item);
+		folderview_update_item(item, FALSE);
+	}
+}
+
 static void folderview_new_folder_cb(FolderView *folderview, guint action,
 				     GtkWidget *widget)
 {