added tooltip for search entry.

git-svn-id: svn://sylpheed.sraoss.jp/sylpheed/trunk@913 ee746299-78ed-0310-b773-934348b2243d
author: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2006-01-20 06:11:52 +0000
committer: hiro <hiro@ee746299-78ed-0310-b773-934348b2243d> 2006-01-20 06:11:52 +0000
commit: 6461df31b433aa0204fbd3e030351437827e65f6 (patch)
tree: aa7e81eb3419b1a3ddc78232232484ed7cfdaa7e /po
parent: d004f1f314aca46c379c86e6e587e0918cc2cf36 (diff)
29 files changed, 6235 insertions, 6119 deletions
diff --git a/po/bg.po b/po/bg.po
index b59a8e13..5f57a991 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -20,196 +20,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Четене на конфигурация за всеки акаунт...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 връзката до %s се разпадна. Свързване...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP директория на сървъра"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "създаване на IMAP4 връзка до %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Не може да се стартира TLS сесия.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Изтриване на съобщение %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копиране на съобщение %s%c%d във %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не могат да се установят изтрити флагове: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "не може да се заличи\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Получаване на съобщения от %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не могат да се установят изтрити флагове: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "не може да затвори папка\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренната папка %s не съществува\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "грешка при получаване на LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не може да се създаде '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не може да се създаде '%s' под Входящи\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Не може да се създаде пощенска кутия: LIST се провали\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "Не може да се създаде пощенска кутия\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "Не може да се преименува пощенска кутия: %s до %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "Не може да се изтрие пощенска кутия\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "не може да се вземе envelope\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Изпращане на съобщение (%d / %d байта)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "грешка при вземане на envelope.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не може да се анализира envelope: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не може да се установи връзка с IMAP4 сървър: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не може да се установи IMAP4 сесия с:  %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "не може да се получи пространството от имена\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не може да се избере папка: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 удостоверяване провалено.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 влизане провалено.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не може да се прибави %s към %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(изпращане на файл...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "съобщението не може да се прибави към %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не може да се копира %s в %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "грешка при imap команда: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "грешка при imap команда: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "грешка при imap команда: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може да преобразува UTF-7 до %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може да преобразува %s до UTF-7\n"
@@ -707,7 +707,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Име"
@@ -963,9 +963,9 @@ msgstr "/Нова _Папка"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -974,7 +974,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Редактиране"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Изтриване"
 
@@ -987,7 +987,7 @@ msgid "Address book"
 msgstr "Адресна книга"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Име:"
 
@@ -1010,16 +1010,16 @@ msgstr "Добавяне"
 msgid "Lookup"
 msgstr "Справка"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "До:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1042,7 +1042,7 @@ msgstr ""
 "Ако изтривате само папката, адресите ще бъдат преместени в родителската "
 "папка."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Изтриване на папка"
 
@@ -1252,7 +1252,7 @@ msgstr "Кафяв"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Никой"
 
@@ -1348,7 +1348,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Редактиране/_Копиране"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Изглед"
 
@@ -1605,7 +1605,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не може да се намери част от multipart съобщение."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Няма Тема)"
 
@@ -1727,7 +1727,7 @@ msgstr "MIME тип"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Размер"
 
@@ -1816,7 +1816,7 @@ msgstr "Аксесоари"
 msgid "Encoding"
 msgstr "Кодиране"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Път"
 
@@ -2042,12 +2042,12 @@ msgstr "Редактиране на папка"
 msgid "Input the new name of folder:"
 msgstr "Въведете новото име на папка:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Въведете име на нова папка:"
 
@@ -2215,42 +2215,42 @@ msgstr "Директория на спула"
 msgid "Select folder"
 msgstr "Избор на папка"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Входящи"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Изпратени"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Опашка"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Кошче"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чернови"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може да бъде включено в име на папка"
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папката `%s' вече съществува"
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Папката `%s' не може да бъде създадена."
@@ -2321,7 +2321,7 @@ msgstr "Нови"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Непрочетени"
 
@@ -2371,22 +2371,22 @@ msgstr "Проверяване за нови съобщения във всич�
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s е избрана\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Изпращане на съобшение..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Възникна грешка при пращане на съобщението до %s."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2396,26 +2396,26 @@ msgstr ""
 "(ако желаете да създадете папка за съхраняване на подпапки,\n"
 " добавете `/' на края на името)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Въведете ново име за `%s'"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Преименуване на папка"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2424,12 +2424,12 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Изтриване на папка"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2440,21 +2440,21 @@ msgstr ""
 "Всички папки и съобщения под `%s' ше бъдат изтрити.\n"
 "Наистина ли желаете изтриване?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Папка `%s' не може да се премахне."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Изчистване на кошчето"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Желаете ли изчистване на кошчето?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2463,34 +2463,34 @@ msgstr ""
 "Желаете ли премахване на пощенската кутия `%s'?\n"
 "(Съобщенията НЕ се изтриват от диска)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Премахване на пощенска кутия"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Желаете ли изтриване на IMAP4 акаунт `%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Изтриване на IMAP4 акаунт"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Желаете ли изтриване на новинарска група `%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Изтриване на новинарска група"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Желаете ли изтриване на новинарски акаунт `%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Изтриване на новинарски акаунт"
 
@@ -2506,7 +2506,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Създаване изглед на заглавните блокове...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Няма От)"
 
@@ -3299,7 +3299,7 @@ msgstr "/_Изглед/_Кодиране/Chinese (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Изглед/_Кодиране/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Изглед/Отваряне в _нов прозорец"
 
@@ -3591,8 +3591,8 @@ msgstr "Създаване на главен прозорец...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr ""
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "готово.\n"
 
@@ -3668,7 +3668,7 @@ msgstr "Sylpheed - Изглед на папките"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Изглед на съобщенията"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Отговор"
 
@@ -3687,15 +3687,15 @@ msgstr "/Отговор _до/_подател"
 msgid "/Reply to mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Препращане"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Пр_епращане като притурка"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/П_ренасочване"
 
@@ -3781,8 +3781,8 @@ msgstr "Предпочитания"
 msgid "Common preferences"
 msgstr "Общи предпочитания"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Акаунт"
 
@@ -3814,7 +3814,7 @@ msgstr "Намиране в текущото съобщение"
 msgid "Find text:"
 msgstr "Намиране на текст:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Чувствителност към размера на символите"
@@ -3859,25 +3859,25 @@ msgstr "Притурки"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не може да се запази файлът `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Изпълняване"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Печат"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4258,7 +4258,7 @@ msgstr "Удостоверяване с POP3 преди изпращане"
 msgid "Command output"
 msgstr "Изход на команда"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Автоматично установяване на следните адреси"
 
@@ -5566,7 +5566,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Макиране"
@@ -5752,36 +5752,36 @@ msgstr "%s: файлът не съществува\n"
 msgid "Folder properties"
 msgstr "Аксесоари на папка"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Идентификатор"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Тип"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Нормална"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Без показване на [...] или (...) в началото на тема в извадката"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Изтриване на [...] или (...) в началото на тема при отговор"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Прилагане към подпапки"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "използване и при отговор"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -5790,21 +5790,21 @@ msgstr "Reply-To:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Автоматично установяване на следните адреси"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Търсенето се провали"
@@ -5820,19 +5820,19 @@ msgstr "Притурка"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Подател"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Дата"
 
@@ -6226,7 +6226,7 @@ msgstr "Не може да се получи списък на новинарс�
 msgid "Can't retrieve newsgroup list."
 msgstr "Не може да се получи списък на новинарската група"
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Изпълнено."
 
@@ -6254,7 +6254,7 @@ msgstr "Сканиране на папка %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Няма Дата)"
 
@@ -6272,349 +6272,353 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Име на файл"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Отговор _до"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Отговор _до/_всички"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Отговор _до/_подател"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Отговор _до/пощенски _списък"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/Пре_местване..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Копиране..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Маркиране"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Маркиране/_Маркиране"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Маркиране/_Размаркиране"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Маркиране/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Маркиране/Маркиране като _непрочетено"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Маркиране/Маркиране като _прочетено"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Маркиране/Маркиране на _всички като прочетени"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Цветен _етикет"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Ре_дактиране "
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Добавяне на подателя в адресната книга"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Създаване на _правило за филтриране"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Създаване на _правило за филтриране/_Автоматично"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Създаване на _правило за филтриране/по _подател"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Създаване на _правило за филтриране/по п_олучател"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Създаване на _правило за филтриране/по _тема"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Изглед/_Изходен код"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Изглед/_Цялата заглавна част"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Печат..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Създаване на изглед на извадката...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Цветен _етикет"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Притурка"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Търсене"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Обработване на маркер"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Има останали маркери. Желаете ли да се обработят?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Сканиране на папка (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Търсене отново"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Няма повече непрочетени съобщения"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Не е намерено непрочетено съобщение. Търсене от края?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Няма непрочетени съобщения."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Не е намерено непрочетено съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Няма повече нови съобщения"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Не е намерено ново съобщение. Търсене от края?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Няма нови съобщения."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Не е намерено ново съобщение. Търсене в следващата папка?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Няма повече маркирани съобщения"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Не е намерено маркирано съобщение. Търсене от края?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Няма маркирани съобщения."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не е намерено маркирано съобщение. Търсене от началото?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Няма повече съобщения с етикет"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Не е намерено съобщение с етикет. Търсене от края?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Няма съобщения с етикет"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не е намерено съобщение с етикет. Търсене от началото?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Събиране на съобщения по тема..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d изтрити"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d преместени"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d копирани"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr "избран(и)"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нови, %d непрочетени, %d общо (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нови, %d непрочетени, %d общо"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Сортиране на извадката..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tСъставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Съставяне на извадката от данните на съобщенията..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Записване на кеша на извадката (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Съобщение %d е маркирано\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Съобщение %d е маркирано като прочетено\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Съобщение %d е маркирано като непрочетено\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Съобщение %s/%d е определено за изтриване\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Изтриване на съобщение(я)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Наистина ли желаете да изтриете съобщенията от кошчето?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Изтриване на повтарящи се съобщения..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Съобщение %s/%d е размаркирано\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Съобщение %d е определено за местене в %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Назначението е същото като текущата папка."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Съобщение %d е определено за копиране в %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Назначението за копиране е същото като текущата папка."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Възникна грешка при обработка на съобщенията."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Изграждане на нишките..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Махане на нишките..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "филтриране..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Филтриране..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "No."
 
@@ -6688,12 +6692,12 @@ msgstr "/_Съобщение/Получаване от _всички акаун�
 msgid "_Send queued messages"
 msgstr "Изпращане на съобщенията в опашката"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Относно"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Изход"
diff --git a/po/cs.po b/po/cs.po
index 66fed057..35e9cba3 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -19,200 +19,200 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Načítám nastavení pro všechny účty...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojení s %s:%d bylo rozpojeno. Obnovuji spojení...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "adresář pro IMAP server"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytvářím spojení IMAP4 s %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Nelze spustit TLS sezení.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Vymazávám zprávu %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Přesouvám zprávu %s%c%d do %s...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopíruji zprávu %s%c%d do %s...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nelze nastavit příznak smazání: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "nelze odstranit\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Získávám zprávy z %s do %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nelze nastavit příznak smazané: 1: %d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označený soubor nebyl nalezen.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "Během příkazu LIST se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nemohu vytvořit '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nemohu vytvořit '%s' v Doručené poště\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nelze vytvořit poštovní schránku: selhal příkaz LIST\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "nelze vytvořit poštovní schránku\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nelze přejmenovat poštovní schránku: %s na %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "nelze smazat poštovní schránku\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "Nemohu načíst obálku\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Posílám zprávu (%d / %d bytů)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "Během načítání obálky se vyskytla chyba.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Nemohu analyzovat obálku: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nemohu se spojit s IMAP4 serverem: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nelze navázat relaci s IMAP4 serverem: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "nemohu najít obálku\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nelze vybrat složku: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentikace selhala."
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Neúspěšné přihlášení k IMAP4.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Nemohu přidat %s do %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(posílám soubor...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "nelze přidat zprávu %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nelze kopírovat %d na %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba příkazu služby imap: STORE %d %d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba příkazu služby imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemůže konvertovat UTF-7 na %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemůže konvertovat %s na UTF-7\n"
@@ -710,7 +710,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Jméno"
@@ -966,9 +966,9 @@ msgstr "/Nová s_ložka"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -977,7 +977,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/Úp_ravy"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Smazat"
 
@@ -990,7 +990,7 @@ msgid "Address book"
 msgstr "Databáze adres"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Jméno:"
 
@@ -1013,16 +1013,16 @@ msgstr "Přidat"
 msgid "Lookup"
 msgstr "Hledat"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopie:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slepá kopie:"
 
@@ -1044,7 +1044,7 @@ msgstr ""
 "Chcete smazat složku '%s' A TAKÉ všechny adresy v ní? \n"
 "Pokud smažete pouze složku, adresy budou přesunuty do nadřazené složky."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Smazat složku "
 
@@ -1253,7 +1253,7 @@ msgstr "Hnědá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Žádná"
 
@@ -1349,7 +1349,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovat"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/Z_obrazit"
 
@@ -1606,7 +1606,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nemohu získat část z mnohačásťové zprávy."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Žádný předmět)"
 
@@ -1728,7 +1728,7 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Délka"
 
@@ -1817,7 +1817,7 @@ msgstr "Vlastnosti"
 msgid "Encoding"
 msgstr "Kódování"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta k souboru"
 
@@ -2044,12 +2044,12 @@ msgstr "Upravit složku"
 msgid "Input the new name of folder:"
 msgstr "Zadejte název složky:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nová složka"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Zadejte název složky:"
 
@@ -2217,42 +2217,42 @@ msgstr "Spool adresář"
 msgid "Select folder"
 msgstr "Vybrat složku"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Doručená pošta"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odeslaná pošta"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Fronta"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Koš"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "Nová složka"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "%c nemůže být obsaženo ve jméně složky."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Složka '%s' už existuje."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nemohu vytvořit složku '%s'."
@@ -2323,7 +2323,7 @@ msgstr "Nová"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Nepřečtené"
 
@@ -2374,22 +2374,22 @@ msgstr "Zjišťuji nové zprávy ve všech složkách..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Je vybrána složka %s\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Posílám zprávu"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, 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:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2399,26 +2399,26 @@ msgstr ""
 "(Pokud chcete vytvořit složku, která bude mít další\n"
 "podsložky, přidejte nakonec názvu '/')"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadejte nové jméno pro '%s' :"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Přejmenovat složku"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2427,12 +2427,12 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Smazat složku "
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2443,21 +2443,21 @@ msgstr ""
 "Všechny složky a zprávy v '%s' budou vymazány.\n"
 "Chcete je opravdu smazat ?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nemohu odstranit složku '%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Vyprázdnit koš"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Vyprázdnit všechny zprávy v koši?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2466,34 +2466,34 @@ msgstr ""
 "Opravdu odebrat poštovní schránku '%s'?\n"
 "(Zprávy NEBUDOU smazány z disku)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Odstranit poštovní schránku"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Opravdu smazat IMAP4 účet '%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Smazat IMAP4 účet"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Opravdu chcete smazat diskusní skupinu '%s' ?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Smazat diskusní skupinu"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Opravdu smazat účet pro diskusní skupinu '%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Smazat účet pro diskuzní skupinu"
 
@@ -2509,7 +2509,7 @@ msgstr "Předmět:"
 msgid "Creating header view...\n"
 msgstr "Vytvářím náhled na záhlaví...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(není znám odesílatel)"
 
@@ -3302,7 +3302,7 @@ msgstr "/Z_obrazit/_Znaková sada/Čínská (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Z_obrazit/_Znaková sada/Korejská (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/Z_obrazit/Otevřít v _novém okně"
 
@@ -3594,8 +3594,8 @@ msgstr "Vytvářím hlavní okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavní okno: barevné rozvržení %d bylo neúspěšné\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3672,7 +3672,7 @@ msgstr "Sylpheed - Zobrazení složky"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazení zprávy"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Odpovědět"
 
@@ -3691,15 +3691,15 @@ msgstr "/Odpovědět _komu/_odesílateli"
 msgid "/Reply to mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Př_edat dál"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Přeposlat _jako přílohu"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Přes_měrovat"
 
@@ -3785,8 +3785,8 @@ msgstr "Nastavení"
 msgid "Common preferences"
 msgstr "Společná nastavení"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Účet"
 
@@ -3818,7 +3818,7 @@ msgstr "Hledat v aktuální zprávě"
 msgid "Find text:"
 msgstr "Najít text:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Rozlišovat malá a velká písmena"
@@ -3863,25 +3863,25 @@ msgstr "Přílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemohu uložit soubor '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Provést"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Tisk"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4261,7 +4261,7 @@ msgstr "Autentizace s POP3 před posláním"
 msgid "Command output"
 msgstr "Výstup příkazu"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastavit následující adresy"
 
@@ -5568,7 +5568,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Označit"
@@ -5755,36 +5755,36 @@ msgstr "%s: soubor neexistuje\n"
 msgid "Folder properties"
 msgstr "Vlastnosti složky"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Specifikátor"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Typ"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normální"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nezobrazovat  v přehledu na začátku předmětu [...] nebo (...)"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Při odpovědi smazat ze začátku předmětu [...] nebo (...)"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Zahrnout podsložky"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "použít také při odpovědi"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Odpovědět komu:"
 
@@ -5793,21 +5793,21 @@ msgstr "Odpovědět komu:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automaticky nastavit následující adresy"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Složka"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Vyhledání složky"
@@ -5823,19 +5823,19 @@ msgstr "Příloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Předmět"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Datum"
 
@@ -6229,7 +6229,7 @@ msgstr "vymazávám diskusní skupinu %s ...\n"
 msgid "Can't retrieve newsgroup list."
 msgstr "Nemohu načíst seznam diskuzních skupin."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Hotovo."
 
@@ -6257,7 +6257,7 @@ msgstr "Prohledávám složku %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Žádné datum)"
 
@@ -6276,350 +6276,354 @@ msgstr "Přerušení akcí"
 msgid "Folder name:"
 msgstr "Název souboru"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Odpovědět _komu"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Odpovědět _komu/_všem"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Odpovědět _komu/_odesílateli"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odpovědět _komu/do _diskusního listu"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Přesunout..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopírovat..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Označit"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Označit/_Označit"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Označit/_Zrušit označení"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Označit/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Označit/Označit jak_o nepřečtené"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označit/Označit jako př_ečtené"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označit/Označit všechny jako _přečtené"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/_Barevné označení"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Z_novu upravit"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Přidat odesílatele do data_báze adres"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/_Vytvořit filtr"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Vytvořit filtr/_Automaticky"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Vytvořit filtr/podle _Od"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Vytvořit filtr/podle _Komu"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Vytvořit filtr/podle _Předmětu"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Zobrazit/_Zdroj"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Zobrazit/Všechna zá_hlaví"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Tisk..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Vytvářím celkový pohled...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Barevné označení"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Příloha"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Vyhledat"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Zpracovat označené"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Zbyly nějaké označené. Zpracovat je?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prohledávám složku (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Hledat znova"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Nejsou již žádné nepřečtené zprávy"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Žádné nepřečtené zprávy."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Nejsou již žádné nové zprávy"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nová zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Žádné nové zprávy."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Nebyla nalezena žádná nová zpráva. Chcete jít do další složky?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Nejsou již žádné označené zprávy"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Nebyla nalezena žádná nepřečtená zpráva. Hledat od konce?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Žádná neoznačená zpráva."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nebyla nalezena žádná neoznačená zpráva. Hledat od začátku?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Nejsou již žádné zprávy s návěštím"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Nebyla nalezena žádná zpráva s návěštím. Hledat od konce?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Žádná zpráva s návěštím."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenalezena žádná zpráva s návěštím. Hledat od začátku?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Získávám zprávy od osoby..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d smazané"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d přemístěné"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s %d zkopírováno"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " položky(ek) vybrány"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nová(é), %d nepřečtená(é), celkem %d (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nových, %d nepřečtených, %d celkem"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Celkové setřídění..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Nastavuji přehled z dat zpráv..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisuji celkovou mezipaměť (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Zpráva %d je označena\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Zpráva %d je označena jako přečtená\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Zpráva %d je označena jako nepřečtená\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Zpráva %s/%d je nastavena ke smazání\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Smazat zprávu(y)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Opravdu chcete smazat tuto zprávu(y) z koše?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Vymazávám duplikované zprávy..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Zpráva %s/%d je odznačena\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Zpráva %d je nastavena pro přesun do %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Cílová položka je stejná jako aktuální složka."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Zpráva %d je nastavena pro kopírování do %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cíl kopírování je stejný jako aktuální složka."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Během zpracovávání pošty se vyskytla chyba ."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Vytvářím vlákna..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Ruším vlákna..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtruji..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtruji..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Zpráva %d už byla v mezipaměti.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Čís."
 
@@ -6694,12 +6698,12 @@ msgstr "/_Zpráva/Přijmout _ze všech účtů"
 msgid "_Send queued messages"
 msgstr "Odešle pozdrženou zprávu(y)"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "O aplikaci"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Ukončení programu"
diff --git a/po/da.po b/po/da.po
index 486422a3..95c117a9 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2003-07-29 09:05+0200\n"
 "Last-Translator: Andreas Hinz <news3@acci.dk>\n"
 "Language-Team: \n"
@@ -18,198 +18,198 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Læs konfiguration for hver konto...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 forbindelse til %s blev afbrudt. Forbinder...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP server sti."
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Kan ikke starte TLS session.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Sletter meddelelse %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flytter meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierer meddelelse %s%c%d til %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan ikke sætte slettede flag: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "kan ikke slette\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Modtager meddelelse fra %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan ikke sætte slettet flag: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markéret fil ikke fundet.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "fejl ved modtagelse af LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan ikke oprette '%s'\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan ikke oprette mailbox: LIST fejlet\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "kan ikke oprette mailbox\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan ikke omdøbe mailbox: %s til %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "kan ikke slette mailbox\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "kan ikke modtage kovert\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Sender meddelelse (%d / %d bytes)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "fejl ved modtagelse af kuvert.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan ikke læse kuvert: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ingen forbindelse med IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "kan ikke modtage namespace\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan ikke vælge mappe %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 godkendelse fejlede.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fejlet.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan ikke tilføje %s til %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(sender fil...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan ikke tilføje meddelelse %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan ikke kopiere %s til %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fejl ved IMAP kommando: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fejl ved IMAP kommand: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "fejl ved IMAP kommand: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan ikke konvertere UTF-7 til %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv can ikke konvertere %s til UTF-7\n"
@@ -711,7 +711,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Navn"
@@ -967,9 +967,9 @@ msgstr "/Ny _mappe"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -978,7 +978,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Redigér"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Slet"
 
@@ -991,7 +991,7 @@ msgid "Address book"
 msgstr "Adressebog"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Navn:"
 
@@ -1014,16 +1014,16 @@ msgstr "Tilføj"
 msgid "Lookup"
 msgstr "Overblik"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Til:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1045,7 +1045,7 @@ msgstr ""
 "Vil du virkeligt slette mappen OG alla adresser i `%s' ? \n"
 "Hvis kun mappen slettes, vil adresserne blive flyttet til hoved mappen."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Slet mappe"
 
@@ -1250,7 +1250,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Ingen"
 
@@ -1346,7 +1346,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigér/K_opiere"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Vis"
 
@@ -1603,7 +1603,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan ikke hente del af multipart meddelese."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Intet emne)"
 
@@ -1725,7 +1725,7 @@ msgstr "MIME type"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Størrelse"
 
@@ -1814,7 +1814,7 @@ msgstr "Egenskaber"
 msgid "Encoding"
 msgstr "Tegnsæt kodning"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sti"
 
@@ -2040,12 +2040,12 @@ msgstr "Redigér mappe"
 msgid "Input the new name of folder:"
 msgstr "Indtast nyt gruppenavn:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Ny mappe"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Indtast ny mappes navn:"
 
@@ -2213,42 +2213,42 @@ msgstr "Spool sti"
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Indbakke"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Sendt"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kø"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Slettet"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Kladde"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NyMappe"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' kan ikke benyttes i mappe navn."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen `%s' eksisterer allerede."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan ikke oprette mappe `%s'."
@@ -2319,7 +2319,7 @@ msgstr "Ny"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Ulæst"
 
@@ -2370,22 +2370,22 @@ msgstr "Henter nye meddelelser i alle mapper..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappe %s er valgt\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sende meddelelse..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fejl ved afsendelse af meddelelse til %s ."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2395,26 +2395,26 @@ msgstr ""
 "(hvis du vil oprette mappe til undermapper,,\n"
 "så afslut navn med `/')"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nyt navn for `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Omdøb mappe"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2423,12 +2423,12 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2439,21 +2439,21 @@ msgstr ""
 "Alle mapper og meddelelser i `%s' vil blive slettet.\n"
 "Vil du virkelig slette?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan ikke slette mappe `%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Tøm Slettet"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Slet alle meddelelser i Slettet?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2462,34 +2462,34 @@ msgstr ""
 "Virklig slette `%s'?\n"
 "(Meddelelser bliver ikke flernet fra disken)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Slet mappe"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Virklig slette IMAP4 konto `%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Slet IMAP4 konto"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Virklig slette nyhedsgruppe `%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Slet nyhedsgruppe"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Virklig slette nyheds konto `%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Slet nyheds konto"
 
@@ -2505,7 +2505,7 @@ msgstr "Emne:"
 msgid "Creating header view...\n"
 msgstr "Opretter hoved visning...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Ingen Fra)"
 
@@ -3302,7 +3302,7 @@ msgstr "/_Vis/_Tegnsæt/Chinese (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vis/_Tegnsæt/Korean (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Vis/Åbn i nyt vindue"
 
@@ -3594,8 +3594,8 @@ msgstr "Opretter hoved vindue...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HovedVindue: fejl i farve %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "Afsluttet.\n"
 
@@ -3671,7 +3671,7 @@ msgstr "Sylpheed - Mappe visning"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelelses visning"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Svar"
 
@@ -3690,15 +3690,15 @@ msgstr "/_Svar til/_Afsender"
 msgid "/Reply to mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Videresend"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Videresend som _vedhæftet"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/_Omdirigér"
 
@@ -3784,8 +3784,8 @@ msgstr "Opsæt"
 msgid "Common preferences"
 msgstr "Generelt opsæt"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -3817,7 +3817,7 @@ msgstr "Søg i aktuel meddelelse"
 msgid "Find text:"
 msgstr "Søg tekst:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Stor / små forskel"
@@ -3862,25 +3862,25 @@ msgstr "Vedhæftet"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan ikke gemme fil `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Udfør"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Udskriv"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4258,7 +4258,7 @@ msgstr "Godkend med POP3 før afsendelse"
 msgid "Command output"
 msgstr "Kommando tekst"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Udfyld automatisk følgende adresser"
 
@@ -5564,7 +5564,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Markér"
@@ -5750,36 +5750,36 @@ msgstr "%s: fil findes ikke\n"
 msgid "Folder properties"
 msgstr "Mappe egenskaber"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Vælger"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Type"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Vis ikke [...] eller (...) i starten af Emne linien i oversigten"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Slet [...] og (...) i starten af Emne i besvarelser"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Benyt til undermapper"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "benyt også ved svar"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Svar til:"
 
@@ -5788,21 +5788,21 @@ msgstr "Svar til:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Udfyld automatisk følgende adresser"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Mappe"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Gennemsøg mappe"
@@ -5818,19 +5818,19 @@ msgstr "Vedhæftet"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Emne"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Fra"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Dato"
 
@@ -6227,7 +6227,7 @@ msgstr "Kan ikke modtage gruppe liste."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan ikke modtage gruppe liste."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Afsluttet."
 
@@ -6255,7 +6255,7 @@ msgstr "Gennemsøger mappe %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Ingen dato)"
 
@@ -6274,352 +6274,356 @@ msgstr "Afbryd handling"
 msgid "Folder name:"
 msgstr "Fil navn"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/_Svar til"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/_Svar til/_Alle"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/_Svar til/_Afsender"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/_Svar til/_Mail liste"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Flyt..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopier..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Markér"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Markér/_Markér"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Markér/_Slet markéring"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Markér/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markér/_Ulæst"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markér/_Læst"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markér/_Alle læst"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Farve la_bel"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Redigér _igen"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Tilføj afsender til adressebo_g"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/_Opret filter"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Opret filter/_Automatisk"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Opret filter/Efter _Fra"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Opret filter/Efter _Til"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Opret filter/Efter _Emne"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Vis/_Kilde"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Vis/Alle _hoveder"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Udskriv..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Opretter oversigt...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Farve la_bel"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Vedhæftet"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Søg"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Bearbejder markéring"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Nogle markéringer er tilbage. Bearbejde dem?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Søger mappe (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Søg igen"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Ingen ulæste meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Ingen ulæste meddelelser."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Ingen ulæste meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Ikke flere nye meddelelser"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Ingen nye meddelelser fundet. Søg fra slutning?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Ingen nye meddelelser."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Ingen nye meddeleleser fundet. Fortsæt til næste mappe?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Ikke flere ulæste meddelelser"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Ingen markérede meddelelser fundet. Søg bagfra?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Ingen markérede eddelelser."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Ikke flere markérede eddelelser"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Ingen markérede meddelelser funder. Søg bagfra?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Ingen markérede meddelelser."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Ingen markérede meddelelser fundet. Søg forfra?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Samler meddelelser via Emne..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttet"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopieret"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " valgte"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nye, %d ulæst, %d total (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nye, %d ulæste, %d total"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Sorterer oversigt..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tOpretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Opretter oversigt ud fra meddelelses data..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver oversigt (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelelse %d er markéret\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelelse %d er markéret som læst\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelelse %d er markéret som ulæst\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelelse %s/%d er markéret til sletning\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Slet meddelelse(er)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vil du virkelig slette meddelelse(r) fra Slettet?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Sletter dublikerede meddelelser..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelelse %s/%d er ikke markéret.\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelelse %d er markéret til flytning til %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Fra og til mappe er ens"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelelse %d er markéret til kopiering til %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Fra og til mappe er ens."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr ""
 "Fejl ved bearbejdning af e-post:\n"
 "%s"
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Opretter tråde"
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Fjerner tråde"
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtrering..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtrering..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "meddelelse %d er allerede gemt.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Nr."
 
@@ -6694,12 +6698,12 @@ msgstr "/_Meddelelse/Hent fra _alle konti"
 msgid "_Send queued messages"
 msgstr "Sender meddelelse(r) i kø"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Om"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Afslut"
diff --git a/po/de.po b/po/de.po
index cf557f07..d1f82841 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2006-01-14 11:05+0100\n"
 "Last-Translator: Manfred Usselmann <usselmann.m@icg-online.de>\n"
 "Language-Team: German <gnome-de@gnome.org>\n"
@@ -20,194 +20,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lese alle Einstellungen für jeden Account...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-Verbindung zu %s wurde unterbrochen. Verbinde erneut...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-Server verhindert LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "erstelle IMAP4-Verbindung zu %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Kann TLS-Sitzung nicht beginnen.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "Hole Nachricht %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Hänge Nachricht an %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Verschiebe Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiere Nachrichten %s nach %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "Entferne Nachrichten von %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kann gelöschte Flags nicht setzen: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "kann nicht löschen\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Entferne alle Nachrichten in %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kann gelöschte Flags nicht setzen: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "kann Ablage nicht schließen\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "Wurzelverzeichnis %s existiert nicht\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "Fehler beim Empfang von LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kann '%s' nicht erstellen\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Kann '%s' in INBOX nicht erstellen\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kann Mailbox nicht erstellen: LIST fehlgeschlagen\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "kann Mailbox nicht erstellen\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kann Mailbox %s nicht in %s umbenennen\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "kann Mailbox nicht löschen\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "kann die Nachrichteneigenschaften nicht empfangen\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hole Nachrichtenkopfzeilen (%d / %d bytes)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "Fehler beim Empfang der Nachrichteneigenschaften.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kann die Nachrichteneigenschaften nicht bearbeiten: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Keine Verbindung mit IMAP4-Server: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kann IMAP4-Sitzung mit %s:%d nicht aufbauen\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "kann Namensraum nicht empfangen\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kann Ablage %s nicht auswählen\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "Fehler beim IMAP-Befehl: STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-Beglaubigung fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-Login fehlgeschlagen.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kann %s nicht an %s anhängen\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(Datei versenden...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kann Nachricht nicht anhängen an %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kann %s nicht nach %s kopieren\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fehler beim IMAP-Befehl: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fehler beim IMAP-Befehl: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "Fehler beim IMAP-Befehl: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kann UTF-7 nicht nach %s konvertieren\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kann %s nicht nach UTF-7  konvertieren\n"
@@ -714,7 +714,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Name"
@@ -968,9 +968,9 @@ msgstr "/Neue Ab_lage"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -979,7 +979,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Bearbeiten"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Löschen"
 
@@ -992,7 +992,7 @@ msgid "Address book"
 msgstr "Adressbuch"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Name:"
 
@@ -1015,16 +1015,16 @@ msgstr "Hinzufügen"
 msgid "Lookup"
 msgstr "Vorschau"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "An:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1047,7 +1047,7 @@ msgstr ""
 "Wenn Sie nur die Ablage löschen, werden die Adressen in das übergeordnete "
 "Verzeichnis verschoben."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Ablage löschen"
 
@@ -1256,7 +1256,7 @@ msgstr "Braun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Keine"
 
@@ -1347,7 +1347,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Bearbeiten/Aut_omatisches umbrechen"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Ansicht"
 
@@ -1575,7 +1575,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kann einen Teil einer mehrteiligen Nachricht nicht bekommen."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Kein Betreff)"
 
@@ -1697,7 +1697,7 @@ msgstr "MIME-Typ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Größe"
 
@@ -1786,7 +1786,7 @@ msgstr "Eigenschaften"
 msgid "Encoding"
 msgstr "Zeichensatzkodierung"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pfad"
 
@@ -2006,12 +2006,12 @@ msgstr "Ablage bearbeiten"
 msgid "Input the new name of folder:"
 msgstr "Geben Sie den neuen Namen der Ablage ein:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Neue Ablage"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Geben Sie den Namen der neuen Ablage ein:"
 
@@ -2178,42 +2178,42 @@ msgstr "Wähle Verzeichnis"
 msgid "Select folder"
 msgstr "Wähle Ablage"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Posteingang"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gesendet"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Warteschlange"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papierkorb"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Entwürfe"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NeueAblage"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' kann nicht in den Ablagenamen integriert werden."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Die Ablage '%s' existiert bereits."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kann Ablage '%s' nicht erstellen."
@@ -2280,7 +2280,7 @@ msgstr "Neu"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Ungelesen"
 
@@ -2330,22 +2330,22 @@ msgstr "Alle Ablagen auf neue Nachrichten prüfen..."
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ablage %s ist gewählt\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Lade Nachrichten nach %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Fehler beim Herunterladen der Nachrichten in '%s' ."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2355,26 +2355,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:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Neuer Name für '%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Ablage umbenennen"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kann Ablage '%s' nicht umbenennen."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kann Ablage '%s' nicht verschieben."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2383,11 +2383,11 @@ msgstr ""
 "Suchablage '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 msgid "Delete search folder"
 msgstr "Suchablage löschen"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2400,20 +2400,20 @@ msgstr ""
 "\n"
 "Wollen Sie das wirklich?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kann Ablage '%s' nicht entfernen."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Leere Papierkorb"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "Lösche alle Nachrichten im Papierkorb?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2422,34 @@ msgstr ""
 "Mailbox '%s' entfernen?\n"
 "(Die Nachrichten werden NICHT von der Platte gelöscht)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Entferne Mailbox"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "IMAP4-Account löschen"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Newsgroup '%s' wirklich löschen?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Newsgroup löschen"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "News-Account '%s' wirklich löschen?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "News-Account löschen"
 
@@ -2465,7 +2465,7 @@ msgstr "Betreff:"
 msgid "Creating header view...\n"
 msgstr "Erzeuge Kopfzeilenansicht...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Kein Von)"
 
@@ -3246,7 +3246,7 @@ msgstr "/_Ansicht/_Zeichensatz/Chinesisch (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ansicht/_Zeichensatz/Koreanisch (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Ansicht/Öffnen in _neuem Fenster"
 
@@ -3526,8 +3526,8 @@ msgstr "Erstelle Hauptfenster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Haupt-Fenster: Bereitstellung von Farbe %d fehlgeschlagen\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "Fertig.\n"
 
@@ -3600,7 +3600,7 @@ msgstr "Sylpheed - Ablagenansicht"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Nachrichtenansicht"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/An_twort"
 
@@ -3616,15 +3616,15 @@ msgstr "/Ant_wort an Ab_sender"
 msgid "/Reply to mailing _list"
 msgstr "/Antwort an Mailing-_Liste"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Weiterleiten"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Weiterleiten als An_hang"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/_Umadressieren"
 
@@ -3709,8 +3709,8 @@ msgstr "Einstellungen"
 msgid "Common preferences"
 msgstr "Allgemeine Einstellungen"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
@@ -3742,7 +3742,7 @@ msgstr "Aktuelle Nachricht durchsuchen"
 msgid "Find text:"
 msgstr "Text suchen:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Groß-/Kleinschreibung"
@@ -3787,24 +3787,24 @@ msgstr "Anhänge"
 msgid "Message View - Sylpheed"
 msgstr "Nachrichtenansich - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kann Datei `%s' nicht speichern."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr "Diese Nachricht wird mit dem folgenden Befehl gedruckt:"
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 msgid "(Default print command)"
 msgstr "(Standarddruckbefehl)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Drucken"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4176,7 +4176,7 @@ msgstr "Beglaubige mit POP3 vor dem Senden"
 msgid "Command output"
 msgstr "Befehlsausgabe"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Setze folgende Adressen automatisch"
 
@@ -5454,7 +5454,7 @@ msgstr "Ergebnis des Befehls"
 msgid "Age"
 msgstr "Alter"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Markiert"
@@ -5619,37 +5619,37 @@ msgstr "Die Aktion existiert nicht."
 msgid "Folder properties"
 msgstr "Ablage-Eigenschaften"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "Kennzeichen"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Typ"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 "[...] oder (...) am Anfang des Betreffes der Ablageninhaltsansicht nicht "
 "zeigen"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "[...] oder (...) am Anfang des Betreffes der Antwort löschen"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Auf Unterablagen anwenden"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "auch bei Antwort benutzen"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Antwort an:"
 
@@ -5658,19 +5658,19 @@ msgstr "Antwort an:"
 msgid "%s - Edit search condition"
 msgstr "%s - Suchbedingungen bearbeiten"
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Wenn eine der folgenden Bedingungen zutrifft"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Wenn alle der folgenden Bedingungen zutreffen"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 msgid "Folder:"
 msgstr "Ablage:"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 msgid "Search subfolders"
 msgstr "Suche Unterablagen"
 
@@ -5685,19 +5685,19 @@ msgstr "Anhang"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Betreff"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Von"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Datum"
 
@@ -6102,7 +6102,7 @@ msgstr "Hole Newsgroup-Liste..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kann die Newsgroup-Liste nicht empfangen."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Fertig."
 
@@ -6129,7 +6129,7 @@ msgstr "Suche %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Suche %s (%d / %d)..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Kein Datum)"
 
@@ -6145,346 +6145,350 @@ msgstr "Speicherort:"
 msgid "Folder name:"
 msgstr "Ablage Name:"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Ant_wort an"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Ant_wort an/_Alle"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Ant_wort an/Ab_sender"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Antwort an/Mailing-_Liste"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Verschieben..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopieren..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Markieren"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Markieren/_Markieren"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Markieren/Markierung _entfernen"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Markieren/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markieren/Als _ungelesen markieren"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markieren/Als _gelesen markieren"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markieren/_Alle als gelesen markieren"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Far_betikett"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Wi_ederbearbeiten"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/Absender in Adress_buch einfügen"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Filter _erstellen"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Filter _erstellen/_Automatisch"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Filter _erstellen/nach _Von"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Filter _erstellen/nach A_n"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Filter _erstellen/nach _Betreff"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Ansicht/_Quellen"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Ansicht/Alle _Kopfzeilen"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Drucken..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Erstelle Ablageninhaltsansicht...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Far_betikett"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Anhang"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Suchen "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Markierte verarbeiten"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Einige Markierungen sind übrig. Verarbeiten?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Durchsuche Ablage (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "Weiter_suchen"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Keine ungelesene Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Keine ungelesenen Nachrichten."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Keine ungelesene Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Keine weiteren neuen ungelesenen Nachrichten"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Keine neue Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Keine neuen Nachrichten."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Keine neue Nachricht gefunden. Gehe zu nächster Ablage?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Keine weiteren ungelesenen Nachrichten"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Keine markierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Keine markieten Nachrichten."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Keine markierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Keine weiteren etikettierten Nachrichten"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Ende suchen?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Keine etikettierten Nachrichten."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Keine etikettierte Nachricht gefunden. Vom Anfang suchen?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Ziehe Nachrichten nach Betreff an..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d gelöscht"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verschoben"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopiert"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " Einträge gewählt"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d Neue, %d Ungelesene, %d Gesamt"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Sortiere Ablagenansicht..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tErstelle Ablageninhalt aus Nachrichtendaten"
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Erstelle Ablageninhalt aus Nachrichtendaten..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Schreibe Ablageninhaltszwischenspeicher (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Nachricht %d ist markiert.\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Nachricht %d ist markiert als gelesen\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Nachricht %d ist markiert als ungelesen\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Nachricht %s/%d ist zum Löschen markiert\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Nachricht(en) löschen"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Wollen Sie wirklich diese Nachricht(en) aus dem Papierkorb löschen?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Lösche mehrfach vorhandene Nachrichten..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Nachricht %s/%d ist nicht markiert.\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Nachricht %d ist markiert zum Verschieben nach %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Das Ziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Nachricht %d ist markiert zum Kopieren nach %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "Das Kopierziel ist gleich der aktuellen Ablage."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Fehler beim Verarbeiten der Nachrichten."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Threads erstellen..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Threads aufheben..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtern (%d / %d)..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtern..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtern..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Es wurde(n) %d Nachricht(en) gefiltert."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Nr."
 
@@ -6554,11 +6558,11 @@ msgstr "_Empfange von allen Accounts"
 msgid "_Send queued messages"
 msgstr "_Senden wartender Nachrichten"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 msgid "_About"
 msgstr "_Über"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 msgid "E_xit"
 msgstr "Be_enden"
 
diff --git a/po/el.po b/po/el.po
index 46e56970..e547b1a3 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -18,202 +18,202 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Διαβάζω τις ρυθμίσεις για κάθε λογαριασμό...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Η IMAP4 σύνδεση στο %s:%d διακόπηκε. Επανασύνδεση...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Κατάλογος στον εξυπηρέτη IMAP4"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "δημιουργία IMAP4 σύνδεσης στο %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Διαγράφω το μήνυμα"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Μετακινώ το μήνυμα  %s%c%d στο %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Αντιγράφω το μήνυμα %s%c%d στο %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "δεν μπορώ να τα απαλείψω\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Λαμβάνω τα μηνύματα από το %s στο %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "δεν μπορώ να τα σημειώσω ως διεγραμμένα: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Το αρχείο σημάνσεων δεν βρέθηκε.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "δεν μπορώ να δημιουργήσω %s\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox: η LIST απέτυχε\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "δεν μπορώ να δημιουργήσω το mailbox\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "δεν μπορώ να διαγράψω το mailbox\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "δεν μπορώ να λάβω τον φάκελο\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Στέλνω το μήνυμα (%d / %d bytes)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "συνέβη σφάλμα καθώς λάμβανα τον φάκελο.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "δεν μπορώ να διαβάσω τον φάκελο: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Δεν μπορώ να συνδεθώ στον IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr ""
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "δεν μπορώ να επιλέξω τον κατάλογο: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Πιστοποίηση"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Η είσοδος στο IMAP4 απέτυχε.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "δεν μπορώ να προσθέσω το %s στο %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Στέλνω DATA..."
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "δεν μπορώ να προσθέσω το μήνυμα %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "δεν μπορώ να αντιγράψω το %d στο %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "σφάλμα κατά την εντολή imap: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "σφάλμα κατά την εντολή imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -721,7 +721,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Όνομα"
@@ -976,9 +976,9 @@ msgstr "/Νέος κατάλογος"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -987,7 +987,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/Επεξεργασία"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/Διαγραφή"
 
@@ -1000,7 +1000,7 @@ msgid "Address book"
 msgstr "Κατάλογος διευθύνσεων"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Όνομα:"
 
@@ -1023,16 +1023,16 @@ msgstr "Προσθήκη"
 msgid "Lookup"
 msgstr "Αναζήτηση"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Προς:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Κοινοποίηση:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr ""
 
@@ -1055,7 +1055,7 @@ msgstr ""
 "Αν διαγράφετε τον κατάλογο μόνο, οι διευθύνσεις θα μετακινηθούν στον από "
 "πάνω κατάλογο"
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Διαγραφή καταλόγου"
 
@@ -1260,7 +1260,7 @@ msgstr "Καφέ"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Τέλος"
 
@@ -1358,7 +1358,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Επεξεργασία/Αντιγραφή"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/Απεικόνιση"
 
@@ -1626,7 +1626,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Δεν μπορώ να λάβω το τμήμα του πολυτμηματικού μηνύματος"
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Χωρίς Θέμα)"
 
@@ -1746,7 +1746,7 @@ msgstr "τύπος MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Μέγεθος"
 
@@ -1841,7 +1841,7 @@ msgstr "Ιδιότητες"
 msgid "Encoding"
 msgstr "Κωδικοποίηση"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Διάδρομος"
 
@@ -2071,12 +2071,12 @@ msgstr "Επεξεργασία καταλόγου"
 msgid "Input the new name of folder:"
 msgstr "Εισάγετε το νέο όνομα του καταλόγου:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Νέος κατάλογος"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Εισάγετε το όνομα του νέου καταλόγου:"
 
@@ -2249,44 +2249,44 @@ msgstr "Επιλογή καταλόγου"
 msgid "Select folder"
 msgstr "Επιλογή καταλόγου"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Εισερχόμενα"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "Αποστολή"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Ουρά"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Διαγραμμένα"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "Πρόχειρα"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "το `%c' δεν μπορεί να συμπεριλαμβάνεται σε όνομα καταλόγου."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Ο κατάλογος `%s' υπάρχει ήδη."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "δεν μπορώ να δημιουργήσω τον κατάλογο `%s'."
@@ -2361,7 +2361,7 @@ msgstr "Νέα"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Αδιάβαστα"
 
@@ -2415,22 +2415,22 @@ msgstr "Σύνθεση νέου μηνύματος"
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Ο κατάλογος %s είναι επιλεγμένος\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Αποστολή μηνύματος"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Συνέβη σφάλμα κατά την αποστολή του μηνύματος σε %s ."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2440,26 +2440,26 @@ msgstr ""
 "(αν θέλετε να δημιουργήσετε ένα κατάλογο για να βάλετε υποκαταλόγους\n"
 " προσθέστε το `/' στο τέλος του ονόματος)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Δώστε νέο όνομα για `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Μετονομασία καταλόγου"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2468,12 +2468,12 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Διαγραφή καταλόγου"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2484,21 +2484,21 @@ msgstr ""
 "Όλοι οι κατάλογοι και τα μηνύματα κάτω από το `%s' θα διαγραφούν.\n"
 "Θέλετε πράγματι να διαγραφούν;"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Άδειασμα διαγραμμένων"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Να αδειάσω όλα τα διαγραμμένα μηνύματα"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2507,35 +2507,35 @@ msgstr ""
 "Σίγουρα να διαγραφεί το mailbox `%s' ;\n"
 "(Τα μηνύματα ΔΕΝ σβήνονται από τον δίσκο)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Διαγραφή mailbox"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο IMAP4 λογαριασμός `%s';"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Διαγραφή λογαριασμού IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Σίγουρα να διαγραφεί το newsgroup `%s';"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Διαγραφή newsgroup"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Σίγουρα να διαγραφεί ο λογαριασμός news `%s';"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Διαγραφή λογαριασμού news"
 
@@ -2551,7 +2551,7 @@ msgstr "Θέμα:"
 msgid "Creating header view...\n"
 msgstr "Δημιουργώ την απεικόνιση κεφαλίδας...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Χωρίς αποστολέα)"
 
@@ -3399,7 +3399,7 @@ msgstr "/Απεικόνιση/Κωδικοσύνολο/Κινεζικό (ISO-202
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Απεικόνιση/Κωδικοσύνολο/Κορεάτικο (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Άνοιγμα σε νέο παράθυρο"
@@ -3717,8 +3717,8 @@ msgstr "Δημιουργώ το κυρίως παράθυρο...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: η κατανομή χρωμάτων %d απέτυχε\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "έγινε.\n"
 
@@ -3794,7 +3794,7 @@ msgstr ""
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Απάντηση"
 
@@ -3813,16 +3813,16 @@ msgstr "/Απάντηση στον αποστολέα"
 msgid "/Reply to mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Προώθηση"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Προώθηση ως προσάρτηση"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Επαν-επεξεργασία"
@@ -3914,8 +3914,8 @@ msgstr "Επιλογές"
 msgid "Common preferences"
 msgstr "Κοινές Επιλογές"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Λογ/σμός"
 
@@ -3948,7 +3948,7 @@ msgstr "Αποστολή μηνύματος"
 msgid "Find text:"
 msgstr ""
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Διαχωρισμός πεζών/κεφαλαίων"
@@ -3997,25 +3997,25 @@ msgstr "Προσάρτηση"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Δεν μπορώ να διαγράψω τον κατάλογο `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Εκτέλεση"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Εκτύπωση"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4401,7 +4401,7 @@ msgstr "Πιστοποίηση με POP3 πριν την αποστολή"
 msgid "Command output"
 msgstr "Εντολή"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 #, fuzzy
 msgid "Automatically set the following addresses"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
@@ -5704,7 +5704,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Σήμανση"
@@ -5891,37 +5891,37 @@ msgstr "%s: το αρχείο δεν υπάρχει\n"
 msgid "Folder properties"
 msgstr "Ιδιότητες"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Προσδιοριστής"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 #, fuzzy
 msgid "Type"
 msgstr "Τύπος MIME"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr ""
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Απάντηση σε"
@@ -5931,21 +5931,21 @@ msgstr "Απάντηση σε"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Αυτόματος ορισμός αυτών των διευθύνσεων"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Κατάλογος"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Επιλογή καταλόγου"
@@ -5962,19 +5962,19 @@ msgstr "Προσάρτηση"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Θέμα"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Από"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Ημερομηνία"
 
@@ -6383,7 +6383,7 @@ msgstr "δεν μπορώ να πάρω την λίστα των newsgroup"
 msgid "Can't retrieve newsgroup list."
 msgstr "δεν μπορώ να πάρω την λίστα των newsgroup"
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Τέλος"
 
@@ -6412,7 +6412,7 @@ msgstr "Σάρωση καταλόγου %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Χωρίς ημερομηνία)"
 
@@ -6431,367 +6431,371 @@ msgstr "Παράθεση"
 msgid "Folder name:"
 msgstr "Όνομα αρχείου"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 #, fuzzy
 msgid "/Repl_y to"
 msgstr "/Απάντηση σε όλους"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 #, fuzzy
 msgid "/Repl_y to/_all"
 msgstr "/Απάντηση σε όλους"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 #, fuzzy
 msgid "/Repl_y to/_sender"
 msgstr "/Απάντηση στον αποστολέα"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 #, fuzzy
 msgid "/Repl_y to/mailing _list"
 msgstr "/Απάντηση σε όλους"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/Μετακίνηση..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/Αντιγραφή..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/Σήμανση"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/Σήμανση/Σήμανση"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/Σήμανση/Αναίρεση σήμανσης"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/Σήμανση/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Σήμανση/Σήμανση ως αδιάβαστο"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Σήμανση/Σήμανση ως διαβασμένο"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/Σήμανση/Σήμανση όλων ως διαβασμένα"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Χρωματική ταμπέλα"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Επαν-επεξεργασία"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Προσθήκη αποστολέα στον κατάλογο διευθύνσεων"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Περίληψη/Φιλτράρισμα μηνυμάτων"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 #, fuzzy
 msgid "/_View/_Source"
 msgstr "/Απεικόνιση/Εμφάνιση του πηγαίου"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 #, fuzzy
 msgid "/_View/All _header"
 msgstr "/Απεικόνιση/Εμφάνιση της πλήρους κεφαλίδας"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Εκτύπωση..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Δημιουργία απεικόνισης περίληψης...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Χρωματική ταμπέλα"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Προσάρτηση"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Αναζήτηση"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr ""
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Μερικές σημάνσεις έχουν απομείνει. Να επεξεργαστούν;"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Σάρωση καταλόγου (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Η αναζήτηση απέτυχε"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 #, fuzzy
 msgid "No more new messages"
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 #, fuzzy
 msgid "No new messages."
 msgstr "Δεν υπάρχουν αδιάβαστα μηνύματα"
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Δεν βρέθηκαν αδιάβαστα μηνύματα. Να πάω στον επόμενο κατάλογο;"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Δεν υπάρχουν άλλα σημειωμένα μηνύματα"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Δεν υπάρχουν σημειωμένα μηνύματα."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν σημειωμένα μηνύματα. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Δεν υπάρχουν άλλα μηνύματα με ετικέτες"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από το τέλος;"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Δεν υπάρχουν μηνύματα με ετικέτες."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Δεν βρέθηκαν μηνύματα με ετικέτες. Να ψάξω από την αρχή;"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d διαγράφηκαν"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d μετακινήθηκαν"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d αντιγράφηκαν"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " μήνυμα(τα) επιλέχθηκε(αν)"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d νέα, %d αδιάβαστα, %d συνολικά"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Περίληψη ταξινόμησης..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tΟρισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Ορισμός περίληψης από τα δεδομένα του μηνύματος..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr ""
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Το μήνυμα %d σημειώθηκε\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως διαβασμένο\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Το μήνυμα %d σημειώθηκε ως αδιάβαστο\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Το μήνυμα %s/%d έχει οριστεί για διαγραφή\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Διαγραφή μηνύματος"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Θέλετε πράγματι να διαγραφεί αυτή η κεφαλίδα;"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Διαγράφω τα διπλά μηνύματα..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Το μήνυμα %s/%d δεν έχει σημειωθεί\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί για μετακίνηση στο %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Ο προορισμός είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Το μήνυμα %d έχει οριστεί να αντιγραφεί στο %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Ο προορισμός αντιγραφής είναι ίδιος με τον τρέχοντα κατάλογο."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ένα σφάλμα συνέβη καθώς επεξεργάζομαι το mail."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Δημιουργώ τα νήματα..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr ""
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "φιλτράρω..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Φιλτράρω..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "το μήνυμα %d είναι ήδη στη μνήμη.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Αρ."
 
@@ -6865,12 +6869,12 @@ msgstr "/Μήνυμα/Λήψη από όλους τους λογαριασμού
 msgid "_Send queued messages"
 msgstr "Αποστολή όλων των μηνυμάτων από την ουρά"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Σχετικά"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Έξοδος"
diff --git a/po/es.po b/po/es.po
index f6234127..20688b94 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2005-07-08 21:08+0100\n"
 "Last-Translator: Ricardo Mones <mones@aic.uniovi.es>\n"
 "Language-Team: Ricardo Mones <mones@aic.uniovi.es>\n"
@@ -18,195 +18,195 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Leyendo configuración de cada cuenta...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La conexión IMAP4 con %s se ha roto. Reconectando...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "El servidor IMAP4 deshabilita LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexión IMAP4 con %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "No puedo iniciar la sesión TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Borrando mensaje %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensaje %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Obteniendo mensajes desde %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "no puedo establecer los flags borrados: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "no puedo vaciar\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Obteniendo mensajes desde %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "no puedo establecer los flags borrados: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "no se puede cerrar la carpeta\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la carpeta raíz %s no existe\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "hubo un error obteniendo LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "No puedo crear '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "No puedo crear '%s' bajo Entrada\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "no puedo crear el buzón: LIST falló\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "no puedo crear el buzón\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "no puedo renombrar el buzón: %s a %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "no puedo borrar el buzón\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "no se puede obtener la estructura del mensaje\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Enviando mensaje (%d / %d bytes)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "Error obteniendo la estructura del mensaje.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "No se puede interpretar la estructura del mensaje: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "No se puede conectar con el servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "No puedo establecer la sesión IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "no se puede obtener el espacio de nombres\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "no se puede seleccionar la carpeta: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "La autentificación IMAP falló.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "no puedo añadir %s a %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(enviando fichero...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "no se puede añadir el mensaje a %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "no puedo copiar %s a %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "error en el mandato imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "error en el mandato imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "error en el mandato imap: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv no puede convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv no puede convertir %s a UTF-7\n"
@@ -713,7 +713,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nombre"
@@ -967,9 +967,9 @@ msgstr "/Nueva _carpeta"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -978,7 +978,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Borrar"
 
@@ -991,7 +991,7 @@ msgid "Address book"
 msgstr "Agenda de direcciones"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Nombre:"
 
@@ -1014,16 +1014,16 @@ msgstr "Añadir"
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1045,7 +1045,7 @@ msgstr ""
 "¿Quiere borrar la carpeta Y todas las direcciones en «%s»? \n"
 "Si sólo borra la carpeta las direcciones se moverán a la carpeta padre."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1254,7 +1254,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Ninguno"
 
@@ -1345,7 +1345,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/Aut_o-recorte"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Ver"
 
@@ -1575,7 +1575,7 @@ msgid "Can't get the part of multipart message."
 msgstr "No se puede obtener la parte del mensaje multipartes."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1699,7 +1699,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Tamaño"
 
@@ -1788,7 +1788,7 @@ msgstr "Propiedades"
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
@@ -2009,12 +2009,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nombre de la nueva carpeta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nueva carpeta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Nombre de la nueva carpeta:"
 
@@ -2183,42 +2183,42 @@ msgstr "Seleccionar carpeta"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papelera"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NuevaCarpeta"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' no puede estar en el nombre de la carpeta."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La carpeta «%s» ya existe."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "No se puede crear la carpeta «%s»."
@@ -2286,7 +2286,7 @@ msgstr "Nuevos"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "No leídos"
 
@@ -2336,22 +2336,22 @@ msgstr "Comprobar si hay mensajes nuevos en todas las carpetas..."
 msgid "Junk"
 msgstr "Basura"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Descargando mensajes en %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Hubo un error descargando los mensajes en «%s»."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2361,26 +2361,26 @@ msgstr ""
 "(si quiere crear una carpeta para almacenar subcarpetas,\n"
 " añada `/' al final del nombre)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Nuevo nombre para «%s»:"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Renombrar carpeta"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "No se puede mover la carpeta «%s»."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2389,12 +2389,12 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2407,21 +2407,21 @@ msgstr ""
 "\n"
 "¿Está seguro de que quiere borrarla?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "No se puede eliminar la carpeta «%s»."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Vaciar papelera"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Vaciar todos los mensajes de la papelera?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2430,34 +2430,34 @@ msgstr ""
 "¿Realmente desea eliminar el buzón «%s» ?\n"
 "(Los mensajes NO se borrarán del disco)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente la cuenta IMAP4 «%s»?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Borrar cuenta IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar el grupo de noticias «%s»?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de noticias"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar la cuenta de noticias «%s»?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Borrar cuenta de noticias"
 
@@ -2473,7 +2473,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -3255,7 +3255,7 @@ msgstr "/_Ver/Codificación de caract_eres/Chino (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/Codificación de caract_eres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en una ventana _nueva"
 
@@ -3535,8 +3535,8 @@ msgstr "Creando ventana principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando color %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "hecho.\n"
 
@@ -3612,7 +3612,7 @@ msgstr "Sylpheed - Árbol de carpetas"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaje"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Responder"
 
@@ -3628,15 +3628,15 @@ msgstr "/Responder al _remitente"
 msgid "/Reply to mailing _list"
 msgstr "/Responder a la _lista de correo"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adjunto"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Red_irigir"
 
@@ -3721,8 +3721,8 @@ msgstr "Preferencias"
 msgid "Common preferences"
 msgstr "Preferencias comunes"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cuenta"
 
@@ -3754,7 +3754,7 @@ msgstr "Buscar en el mensaje actual"
 msgid "Find text:"
 msgstr "Buscar texto:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Mayús./minús."
@@ -3799,25 +3799,25 @@ msgstr "Adjuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "No puedo guardar el fichero «%s»."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Orden para aprender:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4188,7 +4188,7 @@ msgstr "Autentificación con POP3 antes de enviar"
 msgid "Command output"
 msgstr "Salida de la orden"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Establecer las siguientes direcciones automáticamente"
 
@@ -5470,7 +5470,7 @@ msgstr "Resultado de una orden"
 msgid "Age"
 msgstr "Edad"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Marca"
@@ -5635,36 +5635,36 @@ msgstr "No existe la acción."
 msgid "Folder properties"
 msgstr "Propiedades de la carpeta"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Especificador"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tipo"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "No mostrar [...] o (...) al inicio del asunto en el resumen"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Borrar [...] o (...) al inicio del asunto al responder"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Aplicar en subcarpetas"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "utilizar también al responder"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Responder-A:"
 
@@ -5673,20 +5673,20 @@ msgstr "Responder-A:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Coincidir con alguna de las siguientes"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Coincidir con todas las siguientes"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Carpeta"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Búsqueda fallida"
@@ -5702,19 +5702,19 @@ msgstr "Adjunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Desde"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Fecha"
 
@@ -6109,7 +6109,7 @@ msgstr "No se puede obtener la lista de grupos."
 msgid "Can't retrieve newsgroup list."
 msgstr "No se puede obtener la lista de grupos."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Hecho."
 
@@ -6137,7 +6137,7 @@ msgstr "Revisando carpeta %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Sin fecha)"
 
@@ -6155,351 +6155,355 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Nombre de fichero"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Al _remitente"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/A la _lista de correo"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Mover..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Marcar"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _no leído"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marca_r todos leídos"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de color"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Re_editar"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/Añadir _remitente a la agenda..."
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Herramientas/_Crear regla de filtrado"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Herramientas/_Crear regla de filtrado/_Automáticamente"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Desde"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en _Para"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Herramientas/_Crear regla de filtrado/Basada en el _Asunto"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Ver/_Fuente"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Ver/Todas las cabeceras"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceras...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/E_tiquetar de color"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Adjunto"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Buscar "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Queda alguna marca. ¿Procesarla?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "_Buscar de nuevo"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "No hay más mensajes sin leer"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "No hay mensajes sin leer. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "No hay mensajes sin leer."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "No hay mensajes sin leer. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "No hay más mensajes nuevos"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "No hay más mensajes nuevos. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "No hay mensajes nuevos."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "No hay más mensajes nuevos. ¿Ir a la carpeta siguiente?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "No hay más mensajes marcados"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "No hay mensajes marcados."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "No hay mensajes marcados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "No hay más mensajes etiquetados"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el final?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "No hay mensajes etiquetados."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "No hay mensajes etiquetados. ¿Buscar desde el principio?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensajes por asunto..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuevos, %d no leídos, %d totales (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuevos, %d no leídos, %d totales"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Ordenando cabeceras..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tExtrayendo cabeceras de los mensajes..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Resumiendo los mensajes..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribiendo caché resumen (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaje %d está marcado\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaje %d marcado como leído\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaje %d marcado como no leído\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaje %s/%d marcado para borrar\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Borrar mensaje(s)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quiere realmente borrar el/los mensaje(s) de la papelera?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensajes duplicados..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaje %s/%d desmarcado\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaje %d marcado para mover a %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "El destino es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaje %d marcado para copiar a %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "El destino de la copia es el mismo que la carpeta actual."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Hubo algún error al procesar los mensajes."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Construyendo hilos..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Deshaciendo hilos..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "se ha(n) filtrado %d mensaje(s)."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "No."
 
@@ -6571,12 +6575,12 @@ msgstr "/_Mensaje/Reci_bir/De tod_as las cuentas"
 msgid "_Send queued messages"
 msgstr "Enviar mensaje(s) en la cola"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Acerca de"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Salir"
diff --git a/po/et.po b/po/et.po
index d7adada6..0c2fbc9d 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -18,201 +18,201 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Loen kõigi kontode seaded...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 ühendus %s:%d-ga katkes. Taasühendan...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP serveri kataloog"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "loon IMAP4 ühendust %s:%d-ga ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Ei suuda avada TLS sessiooni.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Kustutan kirja %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Liigutan kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopeerin kirja %s%c%d kausta %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ei suutnud seada kustutatu lippu: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "ei suuda väljastada\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Võtan kirju %s-st ja panen %s-i...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ei suutnud seada kustutatu lippu: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "*Märgi faili ei leidunud.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "Nimistu saamisel tekkis viga.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ei suuda luua '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ei suuda luua '%s' Sisendkasti all\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ei suuda luua kirjakasti: Nimistu ebaõnnestus\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "ei suuda luua kirjakasti\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ei suuda kirjakasti %s-lt ümber nimetada %s-le\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "ei suuda kustutada kirjakasti\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "ei suuda võtta ümbrikut\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Saadan kirja (%d / %d baiti)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "ümbriku võtmisel tekis viga.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ei suutnud avada ümbrikut: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ei suuda ühendada IMAP4 serveriga: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "ei suutnud leida nime asukohta\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ei suuuda valida kausta: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autoriseerimise meetod"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 sissekirjutus ebaõnnestus.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ei suuda %s-d lisada %s-i\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(saadan faili...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ei suuda lisada kirja %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ei suuda %d-d kopeerida %s-i\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imapi käsu täitmisel tekkis viga: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imapi käsu täitmisel tekkis viga: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ei suuda konversteerida UTF-7-t %s-ks\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ei suuda konverteerida %s-i UTF-7-ks\n"
@@ -715,7 +715,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nimi"
@@ -969,9 +969,9 @@ msgstr "/Uus Kaust"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -980,7 +980,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/R_edaktor"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/Kustuta"
 
@@ -993,7 +993,7 @@ msgid "Address book"
 msgstr "Aadressiraamat"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Nimi:"
 
@@ -1016,16 +1016,16 @@ msgstr "Lisa"
 msgid "Lookup"
 msgstr "Otsi"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kellele:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Koopia:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Pimekoopia:"
 
@@ -1047,7 +1047,7 @@ msgstr ""
 "Kas te soovite kustutada kataloogi `%s' JA kõik aadressid ?\n"
 "Kui kustutate ainult kataloogi, siis aadressid kantakse pealmisse kausta."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Kustuta kaust"
 
@@ -1257,7 +1257,7 @@ msgstr "Pruun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Mittemiski"
 
@@ -1354,7 +1354,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/R_edaktor/_Kopeeri"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Vaade"
 
@@ -1611,7 +1611,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ei saa mitmeosalise kirja osa kätte."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Pole pealkirja)"
 
@@ -1733,7 +1733,7 @@ msgstr "MIME tüüp"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Suurus"
 
@@ -1823,7 +1823,7 @@ msgstr "Omadus"
 msgid "Encoding"
 msgstr "Kodeerimine"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Tee"
 
@@ -2049,12 +2049,12 @@ msgstr "Redigeeri kausta"
 msgid "Input the new name of folder:"
 msgstr "Sisesta uus nimi või kaust:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Uus kaust"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Sisesta uue kausta nimi:"
 
@@ -2222,42 +2222,42 @@ msgstr "Kirja jada kataloog"
 msgid "Select folder"
 msgstr "Vali kaust"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Saabunud"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Saadetud"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Järjekord"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prügikast"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Mustandid"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "Uus Kaust"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Sümbol `%c' ei saa olla lisatud kausta nimele."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Kaust %s on juba olemas."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ei suuda luua kausta %s."
@@ -2329,7 +2329,7 @@ msgstr "Uus"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Pole loetud"
 
@@ -2382,22 +2382,22 @@ msgstr "Kõigis kaustades otsitakse uusi kirju..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Valitud on kaust %s\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Saadan kirja"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Tekkis viga kirja saatmisel %s-le."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2407,26 +2407,26 @@ msgstr ""
 "(kui soovite luua kausta, millesse saaks teisi kaustu lisada,\n"
 " siis lisage / nime lõppu)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Sisesta uus nimi %s-le:"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Nimeta kaust ümber"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2435,12 +2435,12 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Kustuta kaust"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2451,21 +2451,21 @@ msgstr ""
 "Kustutatakse kõik kaustad ja kirjad %s-s.\n"
 "Kas sa tõesti soovid kustutada?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ei suuda kausta %s eemaldada."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Tühjenda prügikast"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Kas eemaldada kõik kirjad prügikastist?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2474,34 +2474,34 @@ msgstr ""
 "Kas tõepoolest eemaldada kirjakast %s?\n"
 "(Kirju ei kustutata kettalt)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Eemalda kirjakst"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Kas tõesti kustutada IMAP4 konto %s?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Kustuta IMAP4 konto"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Kas tõesti soovite kustutada uudistegruppi %s?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Kustuta uudistegrupp"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Kas tõesti kustutda uudistegrupp %s ?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Kustuta uudistegrupp"
 
@@ -2517,7 +2517,7 @@ msgstr "Pealkiri:"
 msgid "Creating header view...\n"
 msgstr "Loon päise vaadet...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Eikelleltki)"
 
@@ -3307,7 +3307,7 @@ msgstr "/_Vaade/_Kooditabel/Hiina (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Vaade/_Kooditabel/Korea (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/Vaade/Ava uues aknas"
 
@@ -3599,8 +3599,8 @@ msgstr "Loon peamise akna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "PeaAken: värvi haldamine %d ebaõnnestus\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "tehtud.\n"
 
@@ -3675,7 +3675,7 @@ msgstr "Sylpheed - kausta vaade"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - kirja vaade"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Vastan"
 
@@ -3694,15 +3694,15 @@ msgstr "/Vasta/_saatjale"
 msgid "/Reply to mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Saadan edasi"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Saada edasi manusena"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Suuna ümber"
 
@@ -3788,8 +3788,8 @@ msgstr "Seaded"
 msgid "Common preferences"
 msgstr "Üldised omaduse"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -3821,7 +3821,7 @@ msgstr "Avatud kirjast otsiine"
 msgid "Find text:"
 msgstr "Otsi teksti:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Tõstutundlik"
@@ -3866,25 +3866,25 @@ msgstr "Manused"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ei suuda faili '%s' salvestada."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Käivita"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Trüki"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4265,7 +4265,7 @@ msgstr "Autoriseeri POP3 enne saatmist"
 msgid "Command output"
 msgstr "Käsklus"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Säti järgmised aadressid automaatselt"
 
@@ -5568,7 +5568,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Märk"
@@ -5755,36 +5755,36 @@ msgstr "faili %s ei leidu\n"
 msgid "Folder properties"
 msgstr "Kausta omadus"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "*Määraja"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tüüp"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normaalne"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Vastus saata"
@@ -5794,21 +5794,21 @@ msgstr "Vastus saata"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Säti järgmised aadressid automaatselt"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Kaust"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Kataloogist otsimine"
@@ -5824,19 +5824,19 @@ msgstr "Manus"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Pealkiri"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Kellelt"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Kuupäev"
 
@@ -6230,7 +6230,7 @@ msgstr "Ei saanud uudistegrupi nimistut."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ei saanud uudistegrupi nimistut."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Tehtud."
 
@@ -6258,7 +6258,7 @@ msgstr "Tuhnin kaustas %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Kuupäeva pole)"
 
@@ -6277,350 +6277,354 @@ msgstr "Tsiteerimine"
 msgid "Folder name:"
 msgstr "Failinimi"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Vasta"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Vasta/_kõigile"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Vasta/_saatjale"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Vasta/kirja_listi"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/Nihuta..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/Kopeeri..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/Märk"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/Märk/Märgi"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/Märk/Eemalda märk"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/Märk/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Märk/Märgi kui mitteloetud"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Märk/Märgi loetuks"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/Märk/Märgi kõik loetuks"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Värviline silt"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Kirjutan uuesti"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Lisa saatje aadressi raamatusse"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Loo filtri reeglistik"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Loo filtri reeglistik/Automaatselt"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Loo filtri reeglistik/ kasutades Kellelt"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Loo filtri reeglistik/kasutades Kellele"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Loo filtri reeglistik/ kasutades päälkirja"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/Vaade/Lähtekood"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/Vaade/Kõik päised"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "Trüki..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Loon kokkuvõtte vaate...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Värviline silt"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Manus"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Otsi"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Protsessi märk"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Mõned märgid on jäänud. Protsessime selle?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Tuhnin kaustas (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Otsi uuesti"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Pole rohkem kirju, mida pole loetud."
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Pole rohkem kirju, mida pole loetud. Otsime alates lõpust?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Kirju mida pole loetud ei ole."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Ei leidunud kirju mida pole loetud. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Pole rohkem kirju"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Pole rohkem uusi kirju. Otsime alates lõpust?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Uusi kirju ei ole."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Uusi kirju ei leidu. Otsime järgmisest kaustast?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Pole Rohkem märgitud kirju"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Märgitud kirju ei ole."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Märgitud kirju ei leidunud. Kas otsime algusest?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Rohkem sildiga kirju ei ole"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Rohkem sildiga kirju ei leitud. Kas otsime lõpust?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Rohkem sildiga kirju ei ole."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Rohkem seildiga kirju ei leitud. Kas otsime algusest?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "*Võtan kirju päälkirja järgi..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d on kustutatud"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d on ülekantud"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d on kopeeritud"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " kirja märgitud"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "uusi %d, mitteloetuid %d, kokku %d (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "uusi %d, mitteloetuid %d, kokku %d"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Sorteerin kirjaloendi..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\t sätin kokkuvõtte kirja andmetest..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Teen kokkuvõtte teadete andmetest..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "*Kirjutan koondy puvrisse (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Kiri %d on märgitud\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Kiri %d on märgitud kui läbiloetu\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Kiri %d on märgitud kui mitteloetu\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Kiri %s/%d on määratud kustutamisele\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Kustuta kirjad"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Kas te tõesti soovite kirju eemaldada prügikastist?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Kustutan duplitseeritud kirju..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Kiri %s/%d pole märgitud\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Kiri %d on määratud ülekandmiseks %s-i\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Kiri %d on määratud kopeerimisele %s-i\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Kopeerimise sihtpunkt on sama mis aktiivne kaust."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Tekkis viga kirja protsessimisel."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Loon teemad..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Eemaldan teemad..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtreerin..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtreerin..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "kiri %d on juba salvestatud.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Ei."
 
@@ -6695,12 +6699,12 @@ msgstr "/_Kiri/Võta _kõigilt kontodelt"
 msgid "_Send queued messages"
 msgstr "Saada kirjad järjekorrast"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Sellest"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Välju"
diff --git a/po/fr.po b/po/fr.po
index c0d46257..51c866d1 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2005-08-08 23:57+0100\n"
 "Last-Translator: Nicolas Boos <nicolas.boos@wanadoo.fr>\n"
 "Language-Team: French <traduc@traduc.org>\n"
@@ -26,195 +26,195 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lecture de la configuration des comptes...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connexion IMAP4 vers %s a été interrompue. Reconnexion...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Le serveur IMAP4 désactive LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "création de la connexion IMAP4 vers %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Impossible d'initier la session TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Suppression du message %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copie du message %s%c%d vers %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Réception des messages de %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossible de marquer pour la suppression : %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "impossible de purger\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Réception des messages de %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossible de marquer pour la suppression : 1 : *\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "impossible de fermer le dossier\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "le dossier racine %s n'existe pas\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "Une erreur est survenue lors de la réception de LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossible de créer « %s »\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossible de créer « %s » sous Réception \n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Impossible de créer la boîte aux lettres : LIST échoué.\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "impossible de créer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossible de renomer la boîte aux lettres %s en %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "impossible de supprimer la boîte aux lettres\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "Impossible de faire une enveloppe\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Envoi du message (%d / %d octets)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "erreur lors de la lecture de l'enveloppe.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossible d'analyser l'enveloppe : %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossible de se connecter au serveur IMAP4 : %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossible d'établir une session IMAP4 avec : %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "Impossible d'obtenir l'espace nom\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "Impossible de sélectionner le dossier : %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "L'authentification IMAP4 a échoué.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Échec au login IMAP4.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "Impossible de d'ajouter %s à %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(envoi du fichier...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossible d'ajouter le message à %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossible de copier %s vers %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erreur avec la commande IMAP : STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erreur lors de la commande IMAP : EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "erreur avec la commande IMAP : CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne peut convertir de UTF-7 vers %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne peut convertir de %s vers UTF-7\n"
@@ -725,7 +725,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nom"
@@ -979,9 +979,9 @@ msgstr "/Nouveau _dossier"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -990,7 +990,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/É_dition"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Supprimer"
 
@@ -1003,7 +1003,7 @@ msgid "Address book"
 msgstr "Carnet d'adresses"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Nom :"
 
@@ -1026,16 +1026,16 @@ msgstr "Ajouter"
 msgid "Lookup"
 msgstr "Rechercher"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "À :"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Copie :"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Copie discrète :"
 
@@ -1058,7 +1058,7 @@ msgstr ""
 "Si vous supprimez uniquement le dossier, les adresses seront déplacées dans "
 "le dossier parent."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Suppression de dossier"
 
@@ -1268,7 +1268,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Aucun"
 
@@ -1359,7 +1359,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/É_dition/Justification aut_omatique"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Affichage"
 
@@ -1591,7 +1591,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossible de lire une partie d'un message multipart."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Pas de sujet)"
 
@@ -1713,7 +1713,7 @@ msgstr "Type MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Taille"
 
@@ -1802,7 +1802,7 @@ msgstr "Propriétés"
 msgid "Encoding"
 msgstr "Encodage"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Chemin d'accès"
 
@@ -2026,12 +2026,12 @@ msgstr "Édition du dossier"
 msgid "Input the new name of folder:"
 msgstr "Saisissez le nouveau nom du dossier :"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Saisissez le nom du nouveau dossier :"
 
@@ -2200,42 +2200,42 @@ msgstr "Choix d'un dossier"
 msgid "Select folder"
 msgstr "Choix d'un dossier"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Réception"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Envoyé"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "File d'attente"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Corbeille"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Brouillons"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NouveauDossier"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "« %c » n'est pas valide dans le nom du dossier."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Le dossier « %s » existe déjà."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossible de créer le dossier « %s »."
@@ -2303,7 +2303,7 @@ msgstr "Nouveau"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Non lu"
 
@@ -2353,23 +2353,23 @@ msgstr "Recherche des nouveaux messages..."
 msgid "Junk"
 msgstr "Indésirable"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Dossier %s sélectionné\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Téléchargement des messages dans %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, 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:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2379,26 +2379,26 @@ msgstr ""
 "(si vous voulez créer un dossier pouvant contenir d'autres dossiers,\n"
 " ajouter `/' à la fin du nom)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Saisissez le nouveau nom pour « %s » :"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Changement de nom de dossier"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossible de supprimer le dossier « %s »."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossible de déplacer le dossier « %s »."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2407,12 +2407,12 @@ msgstr ""
 "Ne plus utiliser la boîte aux lettres « %s » (les\n"
 "messages existants ne seront PAS effacés du disque) ?"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Suppression de dossier"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2423,21 +2423,21 @@ msgstr ""
 "Tous les dossiers et messages sous « %s » vont être définitivement effacés.\n"
 "Voulez-vous vraiment les effacer ?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossible de supprimer le dossier « %s »."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Vider la corbeille"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Supprimer tous les messages dans la corbeille ?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2446,34 +2446,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:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Suppression d'une boîte aux lettres"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Confirmez-vous la suppression du compte IMAP4 « %s » ?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Suppression du compte IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Confirmer la suppression du groupe de discussion « %s » ?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Suppression du groupe de discussion"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Confirmer la suppression du compte « %s » des groupes de discussion ?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Suppression du compte des groupes de discussion"
 
@@ -2489,7 +2489,7 @@ msgstr "Sujet :"
 msgid "Creating header view...\n"
 msgstr "Création de la vue des en-têtes...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Pas d'expéditeur)"
 
@@ -3282,7 +3282,7 @@ msgstr "/_Affichage/_Jeu de caractères/Chinois (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Affichage/_Jeu de caractères/Coréen (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Affichage/_Ouvrir dans une nouvelle fenêtre"
 
@@ -3562,8 +3562,8 @@ msgstr "Création de la fenêtre principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fenêtre principale : allocation de la couleur %d échouée\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "terminé.\n"
 
@@ -3638,7 +3638,7 @@ msgstr "Sylpheed - Dossiers"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Message"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Répondre"
 
@@ -3654,15 +3654,15 @@ msgstr "/Répondre à l'_expéditeur"
 msgid "/Reply to mailing _list"
 msgstr "/Répondre à la _liste"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Transférer"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Transférer en pièce _jointe"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Rediri_ger"
 
@@ -3747,8 +3747,8 @@ msgstr "Préférences"
 msgid "Common preferences"
 msgstr "Préférences générales"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Compte"
 
@@ -3780,7 +3780,7 @@ msgstr "Recherche dans le message"
 msgid "Find text:"
 msgstr "Texte recherché :"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Respecter la casse"
@@ -3825,25 +3825,25 @@ msgstr "Pièces jointes"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossible d'enregistrer le fichier « %s »."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Commande d'apprentissage :"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Impression"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4214,7 +4214,7 @@ msgstr "S'authentifier sur le POP3 avant l'envoi"
 msgid "Command output"
 msgstr "Sortie"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Définition automatique des adresses suivantes"
 
@@ -5503,7 +5503,7 @@ msgstr "Résultat de la commande"
 msgid "Age"
 msgstr "Age"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Marque"
@@ -5668,36 +5668,36 @@ msgstr "L'action n'existe pas."
 msgid "Folder properties"
 msgstr "Propriétés du dossier"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Code"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Type"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Ne pas afficher [...] ou (...) au début du sujet dans le résumé"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Supprimer [...] ou (...) au début du sujet lors d'une réponse"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Appliquer aux sous-dossiers"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "utiliser également pour les réponses"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Répondre à :"
 
@@ -5706,20 +5706,20 @@ msgstr "Répondre à :"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Si au moins une des conditions suivantes est remplie"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Si toutes les conditions suivantes sont remplies"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Dossier"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "La recherche a échoué"
@@ -5735,19 +5735,19 @@ msgstr "Pièces jointes"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Sujet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Expéditeur"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Date"
 
@@ -6144,7 +6144,7 @@ msgstr "Impossible d'obtenir la liste des groupes de discussion."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossible d'obtenir la liste des groupes de discussion."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Terminé."
 
@@ -6172,7 +6172,7 @@ msgstr "Analyse du dossier %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Tri en cours..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(aucune date)"
 
@@ -6190,353 +6190,357 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Nom du fichier"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Rép_ondre à"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Rép_ondre à/_tous"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Rép_ondre à/l'_expéditeur"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Rép_ondre à/la _liste"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Déplacer..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Copier..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Marquer"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Marquer/_Marquer"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Marquer/_Démarquer"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Marquer/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marquer/Marquer comme _non lu"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marquer/Marquer comme _lu"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marquer/Marquer _tous comme lus"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Co_lorer"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Réédit_er"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "_Ajouter l'expéditeur au carnet d'adresses..."
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Outils/Créer une règle de f_iltrage"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Outils/Créer une règle de f_iltrage/automatiq_uement"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur l'_expéditeur"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le(s) _destinataire(s)"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Outils/Créer une règle de f_iltrage/basée sur le _sujet"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Affichage/_Voir le message complet"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Affichage/Afficher tous les e_n-têtes"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Im_primer..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Création de la vue de l'index...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Co_lorer"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Pièces jointes"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Rechercher "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Traitement des messages marqués"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Il reste des messages marqués, voulez-vous les traiter ?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Analyse du dossier (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "_Chercher encore"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Plus de message non lu. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Plus de messages non lus"
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Pas de message non lu. Passer au dossier suivant ?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Plus de nouveaux messages"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Plus de nouveaux messages. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Pas de nouveaux messages."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Plus de nouveaux messages. Aller au dossier suivant ?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Pas de message marqué."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Plus de messages marqués"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Plus de messages marqués. Rechercher depuis la fin ?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Plus de messages marqués."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Plus de messages marqués. Rechercher depuis le début ?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Tri des messages par sujet..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d effacé"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d déplacé"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copié"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " élément(s) sélectionné(s)"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nouveau(x), %d non lu(s), %d au total (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nouveau(x), %d non lu(s), %d au total"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Tri de l'index..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tDéfinition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Définition de l'index à partir des données du message..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Écriture du cache index (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Le message %d est marqué\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Le message %d est marqué comme lu\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Le message %d est marqué comme non lu\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Le message %s/%d sera effacé\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Suppression de message(s)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Voulez-vous vraiment supprimer définitivement ce(s) message(s) de la "
 "corbeille ?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Suppression des messages en double..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Le message %s/%d est démarqué\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Le message %d est marqué pour déplacement dans %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "La destination est identique au dossier actuel."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Le message %d est à copier vers %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "La destination et la source de la copie sont identiques."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Une erreur est survenue pendant le traitement des messages."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Construction des threads..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Suppression des threads..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "tri en cours..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Tri en cours..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d message(s) ont été filtré(s)."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "N°"
 
@@ -6608,12 +6612,12 @@ msgstr "/_Message/Réce_ptionner/le courrier de _tous les comptes"
 msgid "_Send queued messages"
 msgstr "Envoyer les messages en attente"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "À propos"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Quitter"
diff --git a/po/gl.po b/po/gl.po
index 0a618eee..5250f399 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2003-01-17 10:05+0100\n"
 "Last-Translator: Jorge Rivas\n"
 "Language-Team: Jorge Rivas\n"
@@ -18,200 +18,200 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lendo configuración de cada conta...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Perdeuse a conexión IMAP4 con %s:%d . Reconectando...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Directorio do servidor IMAP4"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creando conexión IMAP4 con %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Non podo iniciar a sesión TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Borrando mensaxe %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensaxe %s%c%d a %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "non podo establecer os indicadores borrados: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "non podo baleirar\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Obtendo mensaxes dende %s en %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "non podo establecer os indicadores borrados: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Ficheiro de marcas non atopado.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "ocurriu un erro obtendo LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Non podo crear '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Non podo crear '%s' bajo Entrada\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "non podo crear a: LIST falló\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "non podo crear a caixa de correo\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "non podo renomear a caixa de correo: %s a %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "non podo borrar a caixa de correo\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "non se pode obter a estructura da mensaxe\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Enviando mensaxe (%d / %d bytes)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "Erro obtendo a estructura da mensaxe.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Non se pode interpretar a estructura da mensaxe: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Non se pode conectar con o servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Non podo establecer unha sesión IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "no se pode obter o espacio de nomes\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "non se pode seleccionar a carpeta: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Fallo de autenticación"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Autentificación IMAP4 fallida.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "non podo engadir %s a %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(enviando ficheiro...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "non se pode engadir o mensaxe %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "non podo copiar %d a %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non pode convertir UTF-7 a %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non pode convertir %s a UTF-7\n"
@@ -713,7 +713,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
@@ -967,9 +967,9 @@ msgstr "/Nova _carpeta"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -978,7 +978,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Borrar"
 
@@ -991,7 +991,7 @@ msgid "Address book"
 msgstr "Axenda de enderezos"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1014,16 +1014,16 @@ msgstr "Engadir"
 msgid "Lookup"
 msgstr "Buscar"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1045,7 +1045,7 @@ msgstr ""
 "¿Quere borrar a carpeta E todos os enderezos en `%s'? \n"
 "Si so borra a carpeta os enderezos se moverán á carpeta pai."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Borrar carpeta"
 
@@ -1256,7 +1256,7 @@ msgstr "Marrón"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Ningún"
 
@@ -1352,7 +1352,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Copiar"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Ver"
 
@@ -1610,7 +1610,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Non se pode obter a parte do mensaxe multipartes."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Sin asunto)"
 
@@ -1732,7 +1732,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Tamaño"
 
@@ -1821,7 +1821,7 @@ msgstr "Propiedades"
 msgid "Encoding"
 msgstr "Codificación"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ruta"
 
@@ -2047,12 +2047,12 @@ msgstr "Editar carpeta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova carpeta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nova carpeta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Nome da nova carpeta:"
 
@@ -2221,42 +2221,42 @@ msgstr "Directorio de almacén"
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviado"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Cola"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papeleira"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Borradores"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NovaCarpeta"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' non pode estar no nome da carpeta."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "a carpeta `%s' xa existe."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Non se pode crear a carpeta `%s'."
@@ -2327,7 +2327,7 @@ msgstr "Novos"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Non leídos"
 
@@ -2378,22 +2378,22 @@ msgstr "Comprobar si hai mensaxes novos en todas as carpetas..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Carpeta %s seleccionada\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Enviando mensaxe"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ocurriu un erro enviando o mensaxe a %s ."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2403,26 +2403,26 @@ msgstr ""
 "(si quere crear unha carpeta para almacenar subcarpetas,\n"
 " engada `/' o final do nome)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Renomear carpeta"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2431,12 +2431,12 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Borrar carpeta"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2447,21 +2447,21 @@ msgstr ""
 "Todas as carpetas e mensaxes baixo `%s' serán borrados.\n"
 "¿Confirma o borrado?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Non se pode eliminar a carpeta `%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Baleirar papeleira"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "¿Baleirar todas as mensaxes da papeleira?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2470,34 +2470,34 @@ msgstr ""
 "¿Realmente desexa eliminar a caixa de correo `%s' ?\n"
 "(As mensaxes NON se borrarán do disco)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Eliminar mailbox"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "¿Eliminar realmente a conta IMAP4 `%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Borrar conta IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "¿Borrar o grupo de novas `%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Borrar grupo de novas"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "¿Borrar a conta de novas `%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Borrar conta de novas"
 
@@ -2513,7 +2513,7 @@ msgstr "Asunto:"
 msgid "Creating header view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Sin remite)"
 
@@ -3306,7 +3306,7 @@ msgstr "/_Ver/_Codificación/Chines (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Ver/_Codificación/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Ver/Abrir en fiestra _nova"
 
@@ -3598,8 +3598,8 @@ msgstr "Creando Fiestra principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: fallo solicitando cor %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "feito.\n"
 
@@ -3676,7 +3676,7 @@ msgstr "Sylpheed - Arbre de carpetas"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista de mensaxe"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Respostar"
 
@@ -3695,15 +3695,15 @@ msgstr "/Respon_der a/Ó _remitente"
 msgid "/Reply to mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Reenviar"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Reen_viar como adxunto"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Red_irixir"
 
@@ -3789,8 +3789,8 @@ msgstr "Preferencias"
 msgid "Common preferences"
 msgstr "Preferencias comuns"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "conta"
 
@@ -3822,7 +3822,7 @@ msgstr "Buscar no mensaxe actual"
 msgid "Find text:"
 msgstr "Buscar texto:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Maiús./minús."
@@ -3867,25 +3867,25 @@ msgstr "Adxuntos"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Non podo gardar o ficheiro `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Executar"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4266,7 +4266,7 @@ msgstr "Autenticación con POP3 antes de enviar"
 msgid "Command output"
 msgstr "Saida do comando"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
@@ -5568,7 +5568,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Marca"
@@ -5754,36 +5754,36 @@ msgstr "%s: o ficheiro non existe\n"
 msgid "Folder properties"
 msgstr "Propiedades da carpeta"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Especificador"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tipo"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Aplicar en subcarpetas"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "utilizar tamén ó respostar"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Respostar-A:"
 
@@ -5792,21 +5792,21 @@ msgstr "Respostar-A:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Establecer os seguintes enderezos automáticamente"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Carpeta"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Búsqueda fallida"
@@ -5822,19 +5822,19 @@ msgstr "Adxunto"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Asunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Dende"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Data"
 
@@ -6228,7 +6228,7 @@ msgstr "Non se pode obter a lista de grupos."
 msgid "Can't retrieve newsgroup list."
 msgstr "Non se pode obter a lista de grupos."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Feito."
 
@@ -6256,7 +6256,7 @@ msgstr "Revisando carpeta %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Sin data)"
 
@@ -6274,350 +6274,354 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Nome de ficheiro"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Respon_der a"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Respon_der a/A _todos"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Respon_der a/Ó _remitente"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Respon_der a/Á _lista de correo"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Mover..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Marcar"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _non leído"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _leído"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marca_r todos leídos"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/E_tiquetar de cor"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Re_editar"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Engadir _remitente á axenda"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Crear Regra de f_iltrado"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Crear Regra de f_iltrado/_Automáticamente"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Crear Regra de f_iltrado/Baseada en _Dende"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crear Regra de f_iltrado/Baseada en _Para"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crear Regra de f_iltrado/Baseada no _Asunto"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Ver/_Fonte"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Ver/Todas as cabeceiras"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Creando vista de cabeceiras...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/E_tiquetar de cor"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Adxunto"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Buscar"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Procesar marcas"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Queda algunha marca. ¿Procesa-la?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando carpeta (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Búscar de novo"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Non hai mais mensaxes sin ler"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Non hai mensaxes sin ler. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Non hai mensaxes sin leer."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Non hai mensaxes sen ler. ¿Ir á carpeta seguinte?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Non hai mais mensaxes novas"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Non hai mais mensaxes novas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Non hai mensaxes novas."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Non hai máis mensaxes novas. ¿Ir a a carpeta seguinte?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Non hai mais mensaxes marcadas"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Non hai mensaxes marcadas."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non hai mensaxes marcadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Non hai mais mensaxes etiquetadas"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o final?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Non hai mensaxes etiquetadas."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non hai mensaxes etiquetadas. ¿Buscar dende o principio?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensaxes por asunto..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidos"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiado"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " elemento(s) seleccionados"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d non leídos, %d totales (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d non leídos, %d totales"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Ordeando cabeceiras..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tExtraindo cabeceiras das mensaxes..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Resumindo as mensaxes..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Escribindo caché resumo (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensaxe %d está marcado\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensaxe %d marcada como leído\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensaxe %d marcada como non leído\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensaxe %s/%d marcada para borrar\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Borrar mensaxe(s)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "¿Quere realmente borrar a/as mensaxe(s) da papeleira?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Borrando mensaxes duplicadas..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensaxe %s/%d desmarcada\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensaxe %d marcada para mover a %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "o destino e o mismo que a carpeta actual."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensaxe %d marcada para copiar a %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "o destino de copia é a carpeta actual."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Ocurriu un erro mentras se procesaba o correo."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Construindo xerarquía..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Desfacendo xerarquía..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "o mensaxe %d xa esta en caché.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Non."
 
@@ -6692,12 +6696,12 @@ msgstr "/_Mensaxe/Recibir de tod_as as contas"
 msgid "_Send queued messages"
 msgstr "Enviar mensaxe(s) na cola"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Acerca de"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Sair"
diff --git a/po/hr.po b/po/hr.po
index f8a08e5a..305480bc 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -18,202 +18,202 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Čitam konfiguracije za svaki račun...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Direktorij IMAP poslužitelja"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Brišem poruke"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Premještam poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dobivanja LISTe.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati %s\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sandučić: LIST nije uspio\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu kreirati sandučić\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sandučić\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bytea)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobivanja omota.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 poslužiteljom: %s%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati spis: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autorizacija"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login propao.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu pričvrstiti %s na %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Šaljem DATA..."
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu obilježiti poruku %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "greška prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -720,7 +720,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
@@ -972,9 +972,9 @@ msgstr "/Novi _spis"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -983,7 +983,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Uredi"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Obriši"
 
@@ -996,7 +996,7 @@ msgid "Address book"
 msgstr "Adresar"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Ime:"
 
@@ -1019,16 +1019,16 @@ msgstr "Dodaj"
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1050,7 +1050,7 @@ msgstr ""
 "Želite li obrisati spis I sve adrese u `%s' ? \n"
 "Ukoliko brišete samo spis, adrese će biti premještene u prethodni spis."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Obriši spis"
 
@@ -1254,7 +1254,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Ništa"
 
@@ -1352,7 +1352,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Uredi/_Kopiraj"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Pregled"
 
@@ -1620,7 +1620,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti dio višedjelne poruke."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1740,7 +1740,7 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Veličina"
 
@@ -1831,7 +1831,7 @@ msgstr "Postavke"
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Staza"
 
@@ -2058,12 +2058,12 @@ msgstr "Uredi spis"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog spisa:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Novi spis"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog spisa:"
 
@@ -2231,44 +2231,44 @@ msgstr "Spool direktorij"
 msgid "Select folder"
 msgstr "Odaberite spis"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sandučić"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "Pošalji"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NoviSpis"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uključen u ime spisa."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Spis `%s' već postoji."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu stvoriti spis `%s'."
@@ -2341,7 +2341,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Nepročitano"
 
@@ -2395,22 +2395,22 @@ msgstr "Kreiranje nove pošte"
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Spis %s je odabran\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, 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:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2420,26 +2420,26 @@ msgstr ""
 "(ukoliko želite stvoriti spis za pohranjivanje podspisa,\n"
 "dodajte `/' na kraju imena)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Preimenuj spis"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2448,12 +2448,12 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši spis"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2464,21 +2464,21 @@ msgstr ""
 "Svi spisi i poruke pod `%s' biti će obrisane.\n"
 "Želite li ih uistinu obrisati?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke u smeću?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2487,35 +2487,35 @@ msgstr ""
 "Uistinu premjestiti spis `%s' ?\n"
 "(Poruke NEĆE biti obrisane s diska)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/_Ukloni sandučić"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Uistinu obrisati `%s' IMAP4 račun?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 račun"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Uistinu obrisati `%s' news grupu?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Uistinu obrisati `%s' news račun?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Obriši news račun"
 
@@ -2531,7 +2531,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Bez pošiljatelja)"
 
@@ -3380,7 +3380,7 @@ msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
@@ -3695,8 +3695,8 @@ msgstr "Kreiram glavne prozore...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: prikaz boje %d nije uspio\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -3772,7 +3772,7 @@ msgstr ""
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Od_govori"
 
@@ -3791,16 +3791,16 @@ msgstr "/Odgovor_i pošiljatelju"
 msgid "/Reply to mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Prosli_jedi"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Proslijedi kao prilo_g"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Pre-_uredi"
@@ -3888,8 +3888,8 @@ msgstr "Postav"
 msgid "Common preferences"
 msgstr "Uobičajene postavke"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
@@ -3921,7 +3921,7 @@ msgstr "Pronađi u trenutnoj poruci"
 msgid "Find text:"
 msgstr "Pronađi tekst:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Osjetljiv na velika/mala slova"
@@ -3968,25 +3968,25 @@ msgstr "Prilog"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu premjestiti spis `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Ispiši"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4368,7 +4368,7 @@ msgstr "Autoriziraj s POP3 prije slanja"
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi slijedeće adrese"
 
@@ -5663,7 +5663,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Oznaka"
@@ -5850,36 +5850,36 @@ msgstr "%s: datoteka ne postoji\n"
 msgid "Folder properties"
 msgstr "Postavke"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Označitelj"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tip"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr ""
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 #, fuzzy
 msgid "Reply-To:"
 msgstr "Odvovori-Na"
@@ -5889,21 +5889,21 @@ msgstr "Odvovori-Na"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automatski postavi slijedeće adrese"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Spis"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Traži spis"
@@ -5919,19 +5919,19 @@ msgstr "Prilog"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Datum"
 
@@ -6328,7 +6328,7 @@ msgstr "Ne mogu pronaći listu news grupa."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Gotovo."
 
@@ -6357,7 +6357,7 @@ msgstr "Pretražujem spis %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6376,363 +6376,367 @@ msgstr "Citat"
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 #, fuzzy
 msgid "/Repl_y to"
 msgstr "/Odgovori svi_ma"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 #, fuzzy
 msgid "/Repl_y to/_all"
 msgstr "/Odgovori svi_ma"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 #, fuzzy
 msgid "/Repl_y to/_sender"
 msgstr "/Odgovor_i pošiljatelju"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 #, fuzzy
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odgovori svi_ma"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Premjesti..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopiraj..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Označi"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Označi/_Označi"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Označi/_Ukloni oznaku"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Označi/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Označi/Označi kao _nepročitano"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označi/Označi sve _pročitano"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Pre-_uredi"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljatelja u adresar"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Održavanje/_Filtriraj poštu"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Is_piši"
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Kreiram pregled održavanja...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Prilog"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Potraga"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledavam spis (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Polje potrage"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 #, fuzzy
 msgid "No new messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Nastaviti u slijedeći spis?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Nema više label poruka"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema label poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Nema label poruka."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema label poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Prihvaćam poruke po temi..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premješteno"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Postavljam pregled od podataka poruke..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li uistinu obrisati poruke iz smeća?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Brišim duplicirane poruke..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premještanje u %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Destinacija je ista kao i trenutni spis."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinacija za kopiranje je ista kao i trenutni spis."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Izgrađujem stablo..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Rasipavam..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Ne."
 
@@ -6806,12 +6810,12 @@ msgstr "/_Pošta/Primi poštu sa _svih računa"
 msgid "_Send queued messages"
 msgstr "Šalje odložene poruke"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "O"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Izlaz"
diff --git a/po/hu.po b/po/hu.po
index dd306f9b..f568c637 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed-2.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2005-12-27 11:05+0100\n"
 "Last-Translator: Németh Tamás <ntomasz@vipmail.hu>\n"
 "Language-Team: <NONE>\n"
@@ -19,194 +19,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Beállítások beolvasása az összes hozzáféréshez...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Az IMAP4 kapcsolat %s felé megszakadt. Újrakapcsolódás...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP szerver LOGIN kikapcsolva.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d IMAP4 kapcsolat létrehozása ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Nem lehet TLS menetet indítani.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "%d üzenet töltése"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Üzenetek hozzáfűzése ide: %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s üzenetek áthelyezése ide: %s ..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s üzenetek másolása ide: %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "%s üzenetek eltávolítása"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nem lehet beállítani a törölt jelzést: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "nem lehet törölni\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Minden üzenet eltávolítása innen: %s?"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nem lehet beállítani a törölt jelzést: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "mappa bezárása nem sikerült\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s root mappa nem létezik\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "hiba történt a LISTA lekérdezése közben.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' nem hozható létre\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "'%s' nem hozható létre a BEJÖVŐ mappa alatt\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nem lehet létrehozni postaládát: LISTA sikertelen\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "nem lehet létrehozni postaládát\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nem lehet a postaládát átnevezni: %s -> %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "nem lehet törölni a postaládát\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "a borítékot nem lehet megszerezni\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Üzenetfejlécek töltése (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "hiba történt a boríték fogadása közben.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nem lehet értelmezni a borítékot: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 szerverhez nem lehet kapcsolódni\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 szerverhez nem sikerült kapcsolódni: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "névtér nem elérhető\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "%s mappa kiválasztása nem sikerült\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "hiba az IMAP parancs közben: STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "Az IMAP4 azonosítás nem sikerült.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 bejelentkezés sikertelen.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(fájl küldése...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "üzenet nem fűzhető hozzá ehhez: %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s nem másolható ide: %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "hiba az IMAP parancs közben: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "hiba az IMAP parancs közben: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "hiba az IMAP parancs közben: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "az iconv nem tud UTF-7-ből konvertálni ebbe: %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "az iconv nem tudja UTF-7-re konvertálni ezt: %s\n"
@@ -715,7 +715,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Név"
@@ -970,9 +970,9 @@ msgstr "/Ú_j Mappa"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -981,7 +981,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Szerkesztés"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Törlés"
 
@@ -994,7 +994,7 @@ msgid "Address book"
 msgstr "Címjegyzék"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Név:"
 
@@ -1017,16 +1017,16 @@ msgstr "Hozzáadás"
 msgid "Lookup"
 msgstr "Előnézet"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Címzett:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Másolat:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Titkos másolat:"
 
@@ -1048,7 +1048,7 @@ msgstr ""
 "Tényleg törölni szeretné a(z) `%s' mappát ÉS az összes címet benne?\n"
 "Ha csak a mappát törli, a címek átkerülnek a szülő mappába."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Mappa törlése"
 
@@ -1253,7 +1253,7 @@ msgstr "Barna"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Semmi"
 
@@ -1344,7 +1344,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Szerkesztés/A_utomata tördelés"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Nézet"
 
@@ -1572,7 +1572,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Egy több részes üzenet egy darabja nem hozzáférhető."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Nincs Tárgy)"
 
@@ -1695,7 +1695,7 @@ msgstr "MIME típus"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Méret"
 
@@ -1784,7 +1784,7 @@ msgstr "Tulajdonságok"
 msgid "Encoding"
 msgstr "Kódolás"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Elérési út"
 
@@ -2004,12 +2004,12 @@ msgstr "Mappa szerkesztése"
 msgid "Input the new name of folder:"
 msgstr "A mappa új neve:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Új mappa"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Az új mappa neve:"
 
@@ -2176,42 +2176,42 @@ msgstr "Könyvtár választása"
 msgid "Select folder"
 msgstr "Mappa választása"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Bejövő"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Kimenő"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Várakozó"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Kuka"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Vázlatok"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "Új mappa"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' nem tehető a mappanévbe."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' mappa már létezik."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' nem hozható létre."
@@ -2278,7 +2278,7 @@ msgstr "Új"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Olvasatlan"
 
@@ -2328,22 +2328,22 @@ msgstr "Új üzenetek keresése minden mappában..."
 msgid "Junk"
 msgstr "Levélszemét"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s mappa kiválasztva\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Üzenetek letöltése %s mappába ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, 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:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2353,26 +2353,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:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Adja meg `%s' új nevét:"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Mappa átnevezése"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' nem távolítható el."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' mappa nem helyezhető át."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2381,12 +2381,12 @@ msgstr ""
 "Tényleg eltávolítja `%s' postaládát?\n"
 "(Az üzenetek NEM törlődnek a meghajtóról)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Mappa törlése"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2399,20 +2399,20 @@ msgstr ""
 "\n"
 "Biztosan törölni szeretné?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' nem távolítható el."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Kuka ürítése"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "Minden üzenet törlése a kukából?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2421,34 +2421,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:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Postaláda eltávolítása"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Tényleg törli a(z) `%s' IMAP4 hozzáférést?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hozzáférés törlése"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírcsoportot?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Hírcsoport törlése"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Tényleg törli a(z) `%s' hírhozzáférést?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Hírhozzáférés törlése"
 
@@ -2464,7 +2464,7 @@ msgstr "Tárgy:"
 msgid "Creating header view...\n"
 msgstr "Fejléc nézet létrehozása...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Nincs Feladó)"
 
@@ -3244,7 +3244,7 @@ msgstr "/_Nézet/_Karakterkódolás/Kínai (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Nézet/_Karakterkódolás/Koreai (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Nézet/Me_gnyitás új ablakban"
 
@@ -3524,8 +3524,8 @@ msgstr "Főablak létrehozása...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Főablak: %d szín foglalása nem sikerült\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "kész.\n"
 
@@ -3598,7 +3598,7 @@ msgstr "Sylpheed - Mappa nézet"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Üzenet nézet"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Válasz"
 
@@ -3614,15 +3614,15 @@ msgstr "/Válasz a _küldőnek"
 msgid "/Reply to mailing _list"
 msgstr "/Válasz a _levelezőlistának"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Továbbítás"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Csatoláské_nt továbbít"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Átirányí_t"
 
@@ -3707,8 +3707,8 @@ msgstr "Beállítások"
 msgid "Common preferences"
 msgstr "Közös beállítások"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hozzáférés"
 
@@ -3741,7 +3741,7 @@ msgstr "Keresés az aktuális üzenetben"
 msgid "Find text:"
 msgstr "Szöveg keresése:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Nagy- és kisbetű érzékenység"
@@ -3786,24 +3786,24 @@ msgstr "Csatolások"
 msgid "Message View - Sylpheed"
 msgstr "Üzenetnézet - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' fájlt nem lehet elmenteni."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr "Az üzenet a következő paranccsal lesz kinyomtatva:"
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 msgid "(Default print command)"
 msgstr "(Alapértelmezett nyomtatási parancs)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Nyomtatás"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4175,7 +4175,7 @@ msgstr "Azonosítás küldés előtt POP3-mal"
 msgid "Command output"
 msgstr "Parancskimenet"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Az alábbi címek automatikus beállítása"
 
@@ -5450,7 +5450,7 @@ msgstr "A parancs eredménye"
 msgid "Age"
 msgstr "Kor"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Kijelölt"
@@ -5615,35 +5615,35 @@ msgstr "Nem létező művelet."
 msgid "Folder properties"
 msgstr "Mappa tulajdonságai"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "Azonosító"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Típus"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normális"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Ne mutassa a [...] vagy (...) szöveget a tárgy mezőben összegzéskor"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Válasz esetén törölje a [...] vagy (...) szöveget a tárgy mezőből"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Alkalmazás almappákra"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "válasznál is használja"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Válaszcím:"
 
@@ -5652,19 +5652,19 @@ msgstr "Válaszcím:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Néhány egyezik a következőkből"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Minden egyezik a következőkből"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 msgid "Folder:"
 msgstr "Mappa:"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 msgid "Search subfolders"
 msgstr "Almappák keresése"
 
@@ -5679,19 +5679,19 @@ msgstr "Csatolás"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Tárgy"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Feladó"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Dátum"
 
@@ -6083,7 +6083,7 @@ msgstr "Hírcsoport lista letöltése..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nem lehet olvasni a hírcsoportok listáját."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Kész."
 
@@ -6110,7 +6110,7 @@ msgstr "%s keresése..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s keresése (%d / %d)..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Nincs Dátum)"
 
@@ -6126,346 +6126,350 @@ msgstr "Hely:"
 msgid "Folder name:"
 msgstr "Mappanév:"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Vál_asz másnak"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Vál_asz másnak/_mindenkinek"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Vál_asz másnak/a _feladónak"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Vál_asz másnak/_levelezőlistának"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/M_ozgatás..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Másolás..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Kijelöl"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Kijelöl/_Kijelöl"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Kijelöl/Kijelölés _törlése"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Kijelöl/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Kijelöl/O_lvasatlanként jelöl"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Kijelöl/_Olvasottként jelöl"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Kijelöl/_Minden olvasottat kijelöl"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/_Színes címke"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Új_raszerkeszt"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/Küldő hozzáadása a cím_jegyzékhez..."
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Szűrési szabály _létrehozása"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Szűrési szabály _létrehozása/_Automatikusan"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Szűrési szabály _létrehozása/_Feladó alapján"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Szűrési szabály létrehozása/_Címzett alapján"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Szűrési szabály _létrehozása/_Tárgy alapján"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Nézet/_Forrás"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Nézet/_Minden fejléc megjelenítése"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Nyomtat..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Áttekintő nézet létrehozása...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Színes címke"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Csatolás"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Keresés "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Kijelöltek feldolgozása"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Maradt még néhány kijelölt. Feldolgoás?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "(%s) mappa átvizsgálása..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "Keresés ú_jra"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Nincs további olvasatlan üzenet"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Nem található olvasatlan üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Nincs olvasatlan üzenet.."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Nem található olvasatlan üzenet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Nincs több új üzenet"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Nem található új üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Nincs új üzenet."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Nem található új üzenet. Ugrás a következő mappára?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Nincs további kijelölt üzenet"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Nem található kijelölt üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Nincs kijelölt üzenet."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nem található kijelölt üzenet. Keresés az elejéről?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Nincs további címkézett üzenet."
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Nem található címkézett üzenet. Keresés a végéről?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Nincs címkézett üzenet."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nem található címkézett üzenet. Keresés az elejéről?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Üzenetek tárgy szerint..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d törölve"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d mozgatva"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d másolva"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " elem kiválasztva"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d új, %d olvasatlan, %d összesen (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d új, %d olvasatlan, %d összesen"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Összefoglaló rendezése..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tÖsszefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Összefoglaló beállítása az üzenetek adataiból..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Összefoglaló gyorstár írása (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d üzenet kijelölve.\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d üzenet olvasottnak jelölve.\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d üzenet olvasatlannak jelölve.\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d üzenet törlésre kijelölve\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Üzenet(ek) törlése"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Tényleg törölni szeretné az üzenete(ke)t a kukából?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Több példányban létező üzenetek törlése..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s/%d üzenet kijelölésének megszüntetése.\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d üzenet kijelölve %s mappába mozgatásra\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "A cél azonos az aktuális mappával."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d üzenet kijelölve %s mappába másolásra\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "A másolás célja megegyezik az aktuális mappával."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Hiba az üzenetek feldolgozása közben."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Üzenetfolyam felépítése"
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Üzenetfolyam lebontás..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Szűrés (%d / %d)..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "szűrés..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Szűrés..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d üzenet szűrése elvégezve."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Db"
 
@@ -6537,12 +6541,12 @@ msgstr "/_Üzenet/Fog_adás/_Minden hozzáférésről"
 msgid "_Send queued messages"
 msgstr "Várakozó sorból üzenet(ek) küldése"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Névjegy"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Kilépés"
diff --git a/po/it.po b/po/it.po
index e7bec978..412929e1 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.9\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2005-12-15 19:09+0100\n"
 "Last-Translator: Danilo Bodei <dbodei@lombardiacom.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -19,194 +19,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lettura della configurazione per ogni account...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "La connessione IMAP4 a %s è stata interrotta. Riconnessione...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Il server IMAP4 disabilita il LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creazione della connessione IMAP4 a %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Impossibile avviare la sessione TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "Ricezione del messaggio %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Aggiunta di messaggi in %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Spostamento dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copia dei messaggi da %s in %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "Rimozione messaggi %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "impossibile impostare i flag eliminati: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "impossibile cancellare\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Rimozione di tutti i messaggi in %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "impossibile impostare i flag eliminati: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "impossibile chiudere la cartella\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "la cartella radice %s non esiste\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "si è verificato un errore durante la ricezione di LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Impossibile creare «%s»\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Impossibile creare «%s» sotto IN ENTRATA\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "impossibile creare la casella postale: LIST fallito\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "impossibile creare la casella postale\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "impossibile rinominare la casella postale: %s in %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "impossibile eliminare la casella postale\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "impossibile ricevere la busta\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Ricezione intestazioni del messaggio (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "si è verificato un errore durante la ricezione della busta.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "impossibile analizzare la busta: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Impossibile connettersi al server IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Impossibile stabilire la sessione IMAP4 con: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "impossibile ricevere il namespace\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "impossibile selezionare la cartella: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "errore durante il comando imap: STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autenticazione IMAP4 fallita.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Login IMAP4 fallito.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "impossibile aggiungere %s a %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(spedizione del file...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "impossibile aggiungere a %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "impossibile copiare %s in %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "errore durante il comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "errore durante il comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "errore durante il comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv non può convertire UTF-7 in %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv non può convertire %s in UTF-7\n"
@@ -715,7 +715,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
@@ -969,9 +969,9 @@ msgstr "/Nuova _cartella"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -980,7 +980,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Modifica"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/Eli_mina"
 
@@ -993,7 +993,7 @@ msgid "Address book"
 msgstr "Rubrica"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1016,16 +1016,16 @@ msgstr " Aggiungi "
 msgid "Lookup"
 msgstr "Cerca"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "A:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1048,7 +1048,7 @@ msgstr ""
 "Eliminando solo la cartella, gli indirizzi saranno spostati nella cartella "
 "di origine."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Elimina la cartella"
 
@@ -1257,7 +1257,7 @@ msgstr "Marrone"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Niente"
 
@@ -1348,7 +1348,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Modifica/A cap_o automatico"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Visualizza"
 
@@ -1576,7 +1576,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Impossibile ricevere parte del messaggio composto."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Nessun oggetto)"
 
@@ -1702,7 +1702,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Dimensione"
 
@@ -1791,7 +1791,7 @@ msgstr "Proprietà"
 msgid "Encoding"
 msgstr "Codifica"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Percorso"
 
@@ -2012,12 +2012,12 @@ msgstr "Modifica la cartella"
 msgid "Input the new name of folder:"
 msgstr "Inserire il nuovo nome della cartella:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nuova cartella"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Inserire il nome della nuova cartella:"
 
@@ -2185,42 +2185,42 @@ msgstr "Selezione directory"
 msgid "Select folder"
 msgstr "Selezione della cartella"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "In entrata"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Inviata"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Coda"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Cestino"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Bozze"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "Nuova cartella"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "«%c» non può essere incluso nel nome della cartella."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "La cartella «%s» esiste già."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Impossibile creare la cartella «%s»."
@@ -2287,7 +2287,7 @@ msgstr "Nuovi"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Non letti"
 
@@ -2337,22 +2337,22 @@ msgstr "Controllo per nuovi messaggi in tutte le cartelle..."
 msgid "Junk"
 msgstr "Spazzatura"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "La cartella %s è selezionata\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Sto scaricando i messaggi in %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Si è verificato un errore scaricando i messaggi in «%s»."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2362,26 +2362,26 @@ msgstr ""
 "(se si vuole creare una catella per memorizzare sottocartelle,\n"
 " aggiungere «/» alla fine del nome)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Inserire il nuovo nome per «%s»:"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Rinomina la cartella"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Impossibile spostare la cartella «%s»."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2390,12 +2390,12 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Elimina la cartella"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2409,20 +2409,20 @@ msgstr ""
 "\n"
 "Eliminare?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Impossibile rimuovere la cartella «%s»."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Svuota cestino"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "Svuotare tutti i messaggi nel cestino?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2431,34 +2431,34 @@ msgstr ""
 "Rimuovere la casella postale «%s» ?\n"
 "(I messaggi NON saranno eliminati dal disco)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Rimuovi la casella postale"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Eliminare l'account IMAP4 «%s»?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Elimino l'account IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Eliminare il newsgroup «%s» ?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Elimino il newsgroup"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Eliminare l'account delle news «%s» ?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Elimino l'account delle news"
 
@@ -2474,7 +2474,7 @@ msgstr "Oggetto:"
 msgid "Creating header view...\n"
 msgstr "Creazione della vista dell'intestazione...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Nessun mittente)"
 
@@ -3255,7 +3255,7 @@ msgstr "/_Visualizza/Co_difica caratteri/Cinese (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visualizza/Co_difica caratteri/Corea_no (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Visualizza/Apri nuova _finestra"
 
@@ -3535,8 +3535,8 @@ msgstr "Creazione della finestra principale...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "FinestraPrincipale: l'allocazione del colore %d è fallita.\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "fatto.\n"
 
@@ -3610,7 +3610,7 @@ msgstr "Sylpheed - Vista cartella"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Vista messaggio"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Rispondi"
 
@@ -3626,15 +3626,15 @@ msgstr "/Rispondi _al mittente"
 msgid "/Reply to mailing _list"
 msgstr "/Rispondi alla mailing _list"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Inoltra"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Inoltra com_e allegato"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Rispe_disci"
 
@@ -3719,8 +3719,8 @@ msgstr "Preferenze"
 msgid "Common preferences"
 msgstr "Preferenze comuni"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
@@ -3752,7 +3752,7 @@ msgstr "Trova nel messaggio attuale"
 msgid "Find text:"
 msgstr "Testo da trovare:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Maiuscole/minuscole"
@@ -3797,24 +3797,24 @@ msgstr "Allegati"
 msgid "Message View - Sylpheed"
 msgstr "Vista messaggio - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Impossibile salvare il file «%s»."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr "Il messaggio sarà stampato con il seguente comando:"
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 msgid "(Default print command)"
 msgstr "(Comando di stampa predefinito)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Stampa"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4186,7 +4186,7 @@ msgstr "Autentica con POP3 prima dell'invio"
 msgid "Command output"
 msgstr "Output del comando"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Imposta automaticamente i seguenti indirizzi"
 
@@ -5465,7 +5465,7 @@ msgstr "Risultato del comando"
 msgid "Age"
 msgstr "Età"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Segna"
@@ -5630,35 +5630,35 @@ msgstr "L'azione non esiste."
 msgid "Folder properties"
 msgstr "Proprietà della cartella"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "Identificatore"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tipo"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normale"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Non mostrare [...] o (...) all'inizio dell'oggetto nel sommario"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Elimina [...] o (...) all'inizio dell'oggetto nella risposta"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Applica alle sottocartelle"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "usa anche nella risposta"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Rispondi a:"
 
@@ -5667,20 +5667,20 @@ msgstr "Rispondi a:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Corrisponde a qualcuno dei seguenti"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Corrisponde a tutti i seguenti"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Cartella"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Ricerca fallita"
@@ -5696,19 +5696,19 @@ msgstr "Allegato"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Oggetto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Da"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Data"
 
@@ -6101,7 +6101,7 @@ msgstr "Recupero la lista dei newsgroup..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Impossibile recuperare la lista dei newsgroup."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Fatto."
 
@@ -6129,7 +6129,7 @@ msgstr "Analisi della cartella %s..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Nessuna Data)"
 
@@ -6147,348 +6147,352 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Nome del file"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Rispondi _a"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Rispondi _a/t_utti"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Rispondi _a/_mittente"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Rispondi _a/mailing _list"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/Spos_ta..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Copia..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/Seg_na"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/Seg_na/Segn_a"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/Seg_na/To_gli segno"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/Seg_na/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Seg_na/Segna co_me non letto"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Seg_na/Segna come _letto"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/Seg_na/Segna come tutti l_etti"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Colore etic_hetta"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Rim_odifica"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/Aggiungi mittente alla ru_brica..."
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Crea re_gola per il filtro"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Crea re_gola per il filtro/A_utomaticamente"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Crea re_gola per il filtro/con _Da"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Crea re_gola per il filtro/con _A"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Crea re_gola per il filtro/con l'_Oggetto"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Visualizza/_Sorgente"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Visualizza/Tutte le intesta_zioni"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Stam_pa..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Creazione della vista del sommario...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Colore etic_hetta"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Allegato"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Ricerca "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Segno del processo"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Sono rimaste alcune operazioni segnate. Le elaboro?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Esame della cartella (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "_Ricerca ancora"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Non esistono più messaggi non letti"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio non letto. Ricerco dalla fine?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Non esistono messaggi non letti."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio non letto. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Non esistono più messaggi nuovi"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio nuovo. Ricerco dalla fine?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Non esistono messaggi nuovi."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Non è stato trovato nessun messaggio nuovo. Passo alla cartella seguente?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Non esistono più messaggi segnati"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Non esistono messaggi segnati."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio segnato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Non esistono più messaggi etichettati"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dalla fine?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Non esistono messaggi etichettati."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Non è stato trovato nessun messaggio etichettato. Ricerco dall'inizio?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Raggruppamento dei messaggi per oggetto..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d spostato"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiato"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " voci selezionate"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nuovi, %d non letti, %d totale (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nuovi, %d non letti, %d totale"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Ordinamento del sommario..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tImpostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Impostazione del sommario dai dati dei messaggi..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scrittura della cache del sommario (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Il messaggio %d è segnato\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Il messaggio %d è segnato come già letto\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Il messaggio %d è segnato come non letto\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Il messaggio %s/%d è impostato per l'eliminazione\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Elimina il(i) messaggio(i)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Eliminare il(i) messaggio(i) dal cestino?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Eliminazione dei messaggi duplicati..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Il messaggio %s/%d non è segnato\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Il messaggio %d è impostato per lo spostamento in %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "La destinazione coincide con la cartella attuale."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Il messaggio %d è impostato per la copia in %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "La destinazione della copia coincide con la cartella attuale."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Si è verificato un errore durante l'elaborazione dei messaggi."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Costruzione dei thread..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Senza thread..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtraggio (%d / %d)..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtraggio..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtraggio..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sono stati filtrati %d messaggi(o)."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "No."
 
@@ -6561,12 +6565,12 @@ msgstr "/M_essaggio/Rice_vi/Ricevi da _tutti gli account"
 msgid "_Send queued messages"
 msgstr "Invia i messaggi accodati"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Informazioni"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Esci"
diff --git a/po/ja.po b/po/ja.po
index 7f045cd1..a73fd530 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -18,194 +18,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "すべてのアカウント毎の設定を読み込み中...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s へのIMAP4の接続が切れています。再接続します...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAPサーバは LOGIN を無効にしています。\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d へのIMAP4の接続を確立中...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "TLS セッションを開始できません。\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "メッセージ %d を取得中"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "メッセージを %s に追加しています (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "メッセージ %s を %s に移動しています..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "メッセージ %s を %s にコピーしています..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "メッセージ %s を削除しています"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "deleted フラグをセットできません: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "expunge できません\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "%s のすべてのメッセージを削除しています"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "deleted フラグをセットできません: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "フォルダをクローズできません\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "ルートフォルダ %s が存在しません\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST の取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s' を作成できません。\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX の下に '%s' を作成できません。\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "メールボックスを作成できません: LIST に失敗\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "メールボックスを作成できません\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "メールボックスを名称変更できません: %s -> %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "メールボックスを削除できません\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "エンベロープを取得できません\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "メッセージのヘッダを取得中 (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "エンベロープを取得中にエラーが発生しました。\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "エンベロープを解析できません: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 サーバ: %s:%d に接続できません\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "%s:%d との IMAP4 セッションを確立できません\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "namespace を取得できません\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "フォルダ %s を選択できません\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "imap コマンド中のエラー: STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 の認証に失敗しました。\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4のログインに失敗しました。\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s を %s に追加できません\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(ファイルを送信中...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "メッセージを %s に追加できません\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s を %s にコピーできません\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap コマンド中のエラー: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap コマンド中のエラー: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "imap コマンド中のエラー: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv が UTF-7 を %s に変換できません\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv が %s を UTF-7 に変換できません\n"
@@ -712,7 +712,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "名前"
@@ -966,9 +966,9 @@ msgstr "/新規フォルダ(_F)"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -977,7 +977,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/編集(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/削除(_D)"
 
@@ -990,7 +990,7 @@ msgid "Address book"
 msgstr "アドレス帳"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "名前:"
 
@@ -1013,16 +1013,16 @@ msgstr "追加"
 msgid "Lookup"
 msgstr "検索"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "宛先:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1044,7 +1044,7 @@ msgstr ""
 "`%s' 内のすべてのフォルダとアドレスを削除してもいいですか?\n"
 "フォルダのみを削除する場合、アドレスは親フォルダに移動します。"
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "フォルダの削除"
 
@@ -1251,7 +1251,7 @@ msgstr "茶"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "なし"
 
@@ -1342,7 +1342,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/編集(_E)/自動整形(_O)"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/表示(_V)"
 
@@ -1570,7 +1570,7 @@ msgid "Can't get the part of multipart message."
 msgstr "マルチパートメッセージのパートを取得できません。"
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(件名なし)"
 
@@ -1692,7 +1692,7 @@ msgstr "MIME タイプ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "サイズ"
 
@@ -1781,7 +1781,7 @@ msgstr "プロパティ"
 msgid "Encoding"
 msgstr "エンコーディング"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "パス"
 
@@ -2001,12 +2001,12 @@ msgstr "フォルダの編集"
 msgid "Input the new name of folder:"
 msgstr "フォルダの新しい名前を入力してください:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "新規フォルダ"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "新規フォルダの名前を入力してください:"
 
@@ -2173,42 +2173,42 @@ msgstr "ディレクトリの選択"
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "受信箱"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "送信控"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "送信待ち"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "ごみ箱"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NewFolder"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "フォルダ名に `%c' を含むことはできません。"
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "フォルダ `%s' はすでに存在します。"
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "フォルダ `%s' を作成できません。"
@@ -2275,7 +2275,7 @@ msgstr "新着"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "未読"
 
@@ -2325,22 +2325,22 @@ msgstr "全フォルダの新着メッセージをチェック中..."
 msgid "Junk"
 msgstr "迷惑メール"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "フォルダ %s が選択されました\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "%s 中のメッセージをダウンロード中..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "`%s' 中のメッセージのダウンロード中にエラーが発生しました。"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2350,26 +2350,26 @@ msgstr ""
 "(サブフォルダを格納するフォルダを作成したい場合は、\n"
 " 名前の最後に `/' を追加してください)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' の新しい名前を入力してください:"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "フォルダ名の変更"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "フォルダ '%s' の名前を変更できません。"
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "フォルダ `%s' を移動できません。"
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2378,11 +2378,11 @@ msgstr ""
 "検索フォルダ '%s' を削除しますか?\n"
 "実際のメッセージは削除されません。"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 msgid "Delete search folder"
 msgstr "検索フォルダの削除"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2395,20 +2395,20 @@ msgstr ""
 "\n"
 "本当に削除してもいいですか?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "フォルダ '%s' を削除できません。"
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "ごみ箱を空にする"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "ごみ箱の中のメッセージをすべて削除しますか?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2417,34 +2417,34 @@ msgstr ""
 "本当にメールボックス `%s' を削除しますか?\n"
 "(メッセージはディスクからは削除されません)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "メールボックスの削除"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "本当にIMAP4アカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "IMAP4アカウントの削除"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "本当にニュースグループ `%s' を削除しますか?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "ニュースグループの削除"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "本当にニュースアカウント `%s' を削除しますか?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "ニュースアカウントの削除"
 
@@ -2460,7 +2460,7 @@ msgstr "件名:"
 msgid "Creating header view...\n"
 msgstr "ヘッダビューを作成中...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(差出人不明)"
 
@@ -3238,7 +3238,7 @@ msgstr "/表示(_V)/文字エンコーディング(_E)/中国語 (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/表示(_V)/文字エンコーディング(_E)/韓国語 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/表示(_V)/新しいウィンドウで開く(_W)"
 
@@ -3518,8 +3518,8 @@ msgstr "メインウィンドウを作成中...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: 色の割り当て %d に失敗しました\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "完了。\n"
 
@@ -3591,7 +3591,7 @@ msgstr "Sylpheed - フォルダビュー"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - メッセージビュー"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/返信(_R)"
 
@@ -3607,15 +3607,15 @@ msgstr "/差出人に返信(_S)"
 msgid "/Reply to mailing _list"
 msgstr "/メーリングリストに返信(_L)"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/転送(_F)"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/添付として転送(_W)"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/手を加えずに転送(_T)"
 
@@ -3700,8 +3700,8 @@ msgstr "設定"
 msgid "Common preferences"
 msgstr "全般の設定"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "アカウント"
 
@@ -3733,7 +3733,7 @@ msgstr "現在のメッセージ内を検索"
 msgid "Find text:"
 msgstr "検索文字列:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "大文字/小文字を区別"
@@ -3778,24 +3778,24 @@ msgstr "添付"
 msgid "Message View - Sylpheed"
 msgstr "メッセージビュー - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "ファイル `%s' を保存できません。"
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr "メッセージを以下のコマンドで印刷します:"
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 msgid "(Default print command)"
 msgstr "(既定の印刷コマンド)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "印刷"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4165,7 +4165,7 @@ msgstr "送信前にPOP3認証を行う"
 msgid "Command output"
 msgstr "コマンドの出力"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "以下のアドレスを自動指定"
 
@@ -5433,7 +5433,7 @@ msgstr "コマンドの実行結果"
 msgid "Age"
 msgstr "経過日数"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 msgid "Marked"
 msgstr "マーク付き"
 
@@ -5594,35 +5594,35 @@ msgstr "アクションが存在しません。"
 msgid "Folder properties"
 msgstr "フォルダのプロパティ"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "識別子"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "タイプ"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "通常"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "サマリで件名の先頭の[...]または(...)の部分を表示しない"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "返信時に件名の先頭の[...]または(...)の部分を削除する"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "サブフォルダにも適用する"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "返信時にも使用"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -5631,19 +5631,19 @@ msgstr "Reply-To:"
 msgid "%s - Edit search condition"
 msgstr "%s - 検索条件の編集"
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "次の条件のいずれかが該当"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "次の条件のすべてが該当"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 msgid "Folder:"
 msgstr "フォルダ:"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 msgid "Search subfolders"
 msgstr "サブフォルダも検索"
 
@@ -5658,19 +5658,19 @@ msgstr "添付"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "件名"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "差出人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "日付"
 
@@ -6062,7 +6062,7 @@ msgstr "ニュースグループリストを取得中..."
 msgid "Can't retrieve newsgroup list."
 msgstr "ニュースグループリストを取得できません。"
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "完了."
 
@@ -6089,7 +6089,7 @@ msgstr "%s を検索中..."
 msgid "Searching %s (%d / %d)..."
 msgstr "%s を検索中 (%d / %d)..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(日付なし)"
 
@@ -6105,343 +6105,347 @@ msgstr "場所:"
 msgid "Folder name:"
 msgstr "フォルダ名:"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/返信の宛先(_Y)"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/返信の宛先(_Y)/全員に返信(_A)"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/返信の宛先(_Y)/差出人に返信(_S)"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/返信の宛先(_Y)/メーリングリストに返信(_L)"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/移動(_O)..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/コピー(_C)..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/マーク(_M)"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/マーク(_M)/マーク(_M)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/マーク(_M)/マーク解除(_U)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/マーク(_M)/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/マーク(_M)/未読としてマーク(_E)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/マーク(_M)/読んだことにする(_D)"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/マーク(_M)/すべて読んだことにする(_R)"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/カラーラベル(_B)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/再編集(_E)"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/差出人をアドレス帳に追加(_K)..."
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/振り分けルールを作成(_I)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/振り分けルールを作成(_I)/自動(_A)"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/振り分けルールを作成(_I)/_Fromから"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/振り分けルールを作成(_I)/_Toから"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/振り分けルールを作成(_I)/_Subjectから"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/表示(_V)/ソース(_S)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/表示(_V)/すべてのヘッダ(_H)"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/印刷(_P)..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "サマリビューを作成中...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr "すべて"
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 msgid "Have color label"
 msgstr "カラーラベル付き"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 msgid "Have attachment"
 msgstr "添付ファイル付き"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 msgid "Search:"
 msgstr "検索:"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr "件名または差出人を検索"
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "マークの処理"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "マークが残っています。処理しますか?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "フォルダをスキャン中 (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "再検索(_S)"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "未読メッセージなし"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "未読メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "未読メッセージがありません。"
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "未読メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "新着メッセージなし"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "新着メッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "新着メッセージがありません。"
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "新着メッセージがありません。次のフォルダに移動しますか?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "マーク付きメッセージなし"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "マーク付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "マーク付きメッセージがありません。"
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "マーク付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "ラベル付きメッセージなし"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "ラベル付きメッセージがありません。最後から検索しますか?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "ラベル付きメッセージがありません。"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "ラベル付きメッセージがありません。最初から検索しますか?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "メッセージを件名でまとめています..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d 通削除"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 通移動"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 通コピー"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " 通選択"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通 (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "新着 %d 通, 未読 %d 通, 総数 %d 通"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "サマリをソート中..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tメッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "メッセージデータからサマリを設定中..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "サマリキャッシュを書き込み中 (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "メッセージ %d をマークしました\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "メッセージ %d を既読としてマークしました\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "メッセージ %d を未読としてマークしました\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "メッセージ %s/%d を削除するようにセットしました\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "メッセージの削除"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "本当にごみ箱からメッセージを削除してもいいですか?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "重複メッセージを削除しています..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "メッセージ %s/%d をマーク解除しました\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "メッセージ %d を %s に移動するようにセットしました\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "移動先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "メッセージ %d を %s にコピーするようにセットしました\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "コピー先が現在のフォルダと同じです。"
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "メッセージの処理中にエラーが発生しました。"
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "スレッドを構築中..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "スレッドを解除中..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "振り分け中 (%d / %d)..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "振り分け中..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d 通のメッセージが振り分けられました。"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "番号"
 
@@ -6511,10 +6515,10 @@ msgstr "全アカウントから受信(_A)"
 msgid "_Send queued messages"
 msgstr "送信待機中のメッセージを送信(_S)"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 msgid "_About"
 msgstr "このプログラムについて(_A)"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 msgid "E_xit"
 msgstr "終了(_X)"
diff --git a/po/ko.po b/po/ko.po
index b7e9a556..b65d91fd 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -18,201 +18,201 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "각 계정에대한 모든 설정을 읽습니다...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s:%d에대한 IMAP4 접속이 끊어졌습니다. 다시 접속...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP 서버 디렉토리"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d에대한 IMAP4 접속을 만듭니다 ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "TLS 세션을 시작할 수 없습니다.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "%d 메시지를 삭제하는 중"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 이동합니다...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "메시지 %s%c%d를 %s로 복사중입니다 ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "지울 수가 없습니다\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s로부터 %s로 메시지를 가져옵니다...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "삭제 플래그를 설정할 수가 없습니다: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "표시 파일이 발견되지않음.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST를 얻는 도중 에러가 발생.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "'%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "INBOX 아래에 '%s'를 생성할 수가 없습니다\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "우편함을 생성할 수 없습니다: LIST 실패\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "우편함을 생성할 수 없습니다\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "우편함명을 바꿀 수 없습니다: %s에서 %s로\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "우편함을 삭제할 수 없습니다\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "envelope를 얻을 수가 없습니다\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "메시지를 보내는 중 (%d / %d 바이트)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "envelope를 얻는 중 에러 발생.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "envelope를 파싱할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "%s:%d IMAP4 서버에 연결할 수가 없습니다\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 세션을 만들 수 없습니다: %s: %d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "namespace를 얻을 수 없습니다\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "폴더를 선택할 수가 없습니다: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "인증 방법"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 로그인을 실패했습니다.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s를 %s에 붙일 수 없습니다\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(파일을 보냅니다...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "%s 메시지를 추가할 수가 없습니다\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%d를 %s로 복사할 수가 없습니다\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 명령어 실행중 에러: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 명령어 실행중 에러: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv가 UTF-7를 %s로 변환할 수 없습니다\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv가 %s를 UTF-7로 변환할 수 없습니다\n"
@@ -704,7 +704,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "이름"
@@ -958,9 +958,9 @@ msgstr "/새 폴더(_F)"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -969,7 +969,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/편집(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/삭제(_D)"
 
@@ -982,7 +982,7 @@ msgid "Address book"
 msgstr "주소록"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "이름:"
 
@@ -1005,16 +1005,16 @@ msgstr "추가"
 msgid "Lookup"
 msgstr "찾기"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "받는 사람:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "참조:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "숨은 참조:"
 
@@ -1036,7 +1036,7 @@ msgstr ""
 "`%s'의 모든 주소와 폴더를 삭제할까요 ? \n"
 "폴더만 지울 경우 주소는 그 상위 폴더로 옮겨집니다."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "폴더 삭제"
 
@@ -1240,7 +1240,7 @@ msgstr "갈색"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "없음"
 
@@ -1337,7 +1337,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/편집(_E)/복사(_C)"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/보기(_V)"
 
@@ -1594,7 +1594,7 @@ msgid "Can't get the part of multipart message."
 msgstr "multipart 메시지의 부분을 얻을 수가 없습니다."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(제목 없음)"
 
@@ -1715,7 +1715,7 @@ msgstr "마임 타입"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "크기"
 
@@ -1805,7 +1805,7 @@ msgstr "특성"
 msgid "Encoding"
 msgstr "인코딩"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "경로"
 
@@ -2031,12 +2031,12 @@ msgstr "폴더 편집"
 msgid "Input the new name of folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "새 폴더"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "새 폴더의 이름을 넣으세요:"
 
@@ -2204,42 +2204,42 @@ msgstr "스풀 디렉토리"
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "받은 편지함"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "발송 편지함"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "보낼 편지함"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "지운 편지함"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "임시 보관함"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "새 폴더"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c'는 폴더 이름에 포함될 수 없습니다."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' 폴더가 이미 존재합니다."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' 폴더를 생성할 수가 없습니다."
@@ -2310,7 +2310,7 @@ msgstr "새것"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "안읽음"
 
@@ -2361,22 +2361,22 @@ msgstr "모든 폴더의 새로운 메시지를 확인합니다..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s 폴더가 선택되었습니다\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "메시지을 보내는 중"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "%s로 메시지를 보내는 중 에러가 발생했습니다."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2386,26 +2386,26 @@ msgstr ""
 "(만일 하위폴더를 저장하기 위한 폴더를 생성하려면,\n"
 "이름의 마지막에 `/'를 추가하세요)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s'에대한 새 이름을 넣으세요:"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "폴더 이름 변경"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2414,12 +2414,12 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "폴더 삭제"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2430,21 +2430,21 @@ msgstr ""
 "`%s'아래에 있는 모든 폴더와 메시지가 삭제될 것입니다.\n"
 "정말로 삭제하시겠습니까?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' 폴더를 제거할 수가 없습니다."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "지운 편지함 비우기"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "지운 편지함에있는 모든 메시지를 비울까요?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2453,34 +2453,34 @@ msgstr ""
 "`%s' 메일박스를 정말로 삭제하시겠습니까?\n"
 "(메시지가 디스크로부터 삭제되는것은 아닙니다)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "메일박스를 제거합니다"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "정말로 `%s' IMAP4 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 계정 삭제"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "정말로 `%s' 뉴스그룹을 삭제하시겠습니까?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "뉴스그룹 삭제"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "정말로 `%s' 뉴스그룹 계정을 삭제하시겠습니까?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "뉴스그룹 계정 삭제"
 
@@ -2496,7 +2496,7 @@ msgstr "제목:"
 msgid "Creating header view...\n"
 msgstr "헤더 뷰를 생성합니다...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(???)"
 
@@ -3283,7 +3283,7 @@ msgstr "/보기(_V)/문자셋(_C)/Chinese (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/보기(_V)/문자셋(_C)/한국 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/보기(_V)/새 창으로 열기(_w)"
 
@@ -3575,8 +3575,8 @@ msgstr "새 창을 만듭니다...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "메인 창: 색 할당 %d 실패\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "마침.\n"
 
@@ -3652,7 +3652,7 @@ msgstr "Sylpheed - 폴더 보기"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 메시지 보기"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/회신(_R)"
 
@@ -3671,15 +3671,15 @@ msgstr "/회신(_y)/보낸이(_s)"
 msgid "/Reply to mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/전달(_F)"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/첨부로 전달(_w)"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Redirec_t"
 
@@ -3765,8 +3765,8 @@ msgstr "설정"
 msgid "Common preferences"
 msgstr "기본적인 환경 설정"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "계정"
 
@@ -3798,7 +3798,7 @@ msgstr "현재 메시지에서 찾기"
 msgid "Find text:"
 msgstr "찾을 문자열:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "대소 문자 구별"
@@ -3843,25 +3843,25 @@ msgstr "첨부"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' 파일을 저장할 수가 없습니다."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "실행"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "인쇄"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4240,7 +4240,7 @@ msgstr "보내기전 POP3와 인증"
 msgid "Command output"
 msgstr "명령어"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "다음 주소를 자동적으로 정함"
 
@@ -5521,7 +5521,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "표시"
@@ -5707,36 +5707,36 @@ msgstr "%s: 파일이 없습니다\n"
 msgid "Folder properties"
 msgstr "폴더 특성"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "파일 선택"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "형식"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "보통"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "하위 폴더에 적용"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "회신시에도 사용"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "회신주소:"
 
@@ -5745,21 +5745,21 @@ msgstr "회신주소:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "다음 주소를 자동적으로 정함"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "폴더"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "찾기 실패"
@@ -5775,19 +5775,19 @@ msgstr "첨부"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "제목"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "보낸 사람"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "날짜"
 
@@ -6176,7 +6176,7 @@ msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 msgid "Can't retrieve newsgroup list."
 msgstr "뉴스그룹 목록을 얻을 수가 없습니다."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "완료."
 
@@ -6204,7 +6204,7 @@ msgstr "%s 폴더를 스캔합니다..."
 msgid "Searching %s (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(날짜 없슴)"
 
@@ -6222,350 +6222,354 @@ msgstr ""
 msgid "Folder name:"
 msgstr "파일 이름"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/회신(_y)"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/회신(_y)/전체(_a)"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/회신(_y)/보낸이(_s)"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/회신(_y)/메일링리스트(_l)"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "이동(_o)..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/복사(_C)..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/표시(_M)"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/표시(_M)/표시(_U)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/표시(_M)/표시 없앰(_U)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/표시(_M)/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/표시(_M)/읽지않은 것으로 표시(_e)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/표시(_M)/읽은 것으로 표시(_d)"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/표시(_M)/모두 읽은 것으로 표시(_r)"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/색 라벨(_b)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/다시 편집(_e)"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/주소록에 보낸이 추가(_k)"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/필터 규칙 생성(_i)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/필터 규칙 생성(_i)/자동(_A)"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/필터 규칙 생성(_i)/보낸이로(_F)"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/필터 규칙 생성(_i)/받는이로(_T)"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/필터 규칙 생성(_i)/제목으로(_S)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/보기(_V)/소스(_S)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/보기(_V)/모든 헤더(_h)"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/인쇄(_)..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "요약 창을 생성합니다...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/색 라벨(_b)"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "첨부"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "찾기"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "표시 처리"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "표시가 여전히 남아있습니다. 그것들을 처리할까요?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "폴더(%s)를 스캔..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "다시 찾기"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "안 읽은 메시지가 없슴 "
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "안 읽은 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "안 읽은 메시지가 없습니다."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "안 읽은 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "새 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "새 메시지가 없습니다."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "새 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "표시된 메시지가 없습니다"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "표시된 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "표시된 메시지가 없습니다."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "표시된 메시지가 없습니다. 다음 폴더로 갈까요?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "꼬리표있는 메시지가 없습니다"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "꼬리표있는 메시지가 없습니다. 끝에서 부터 찾을까요?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "꼬리표있는 메시지가 없습니다."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "꼬리표있는 메시지가 없습니다. 처음부터 찾을까요?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d개 삭제됨"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d개 이동"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr ""
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " 아이템 선택"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지(%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 새 메시지, %d 안 읽음, %d개 메시지"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "요약을 정렬합니다..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\t메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "메시지 데이타로부터 요약을 만듭니다..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "요약 캐쉬 (%s)를 씁니다..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "메시지 %d가 표시되었습니다\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "메시지 %d가 읽은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "메시지 %d가 읽지않은 것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "메시지 %s/%d가 지울것으로 표시되었습니다\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "메시지를 지웁니다"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "정말로 이 메시지를 휴지통에서 삭제하시겠습니까?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "중복된 메시지를 지웁니다..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "메시지 %s/%d의 표시를 지웠습니다\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "메시지 %d가 %s로 이동하도록 했습니다\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "도착지가 현재 폴더와 같습니다"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr ""
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "복사할 대상이 현재 폴더와 같습니다."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "메일을 처리하는 도중 에러"
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "쓰레드를 만듭니다..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "쓰레드를 없앱니다..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "필터링..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "메시지 %d는 이미 캐쉬되었습니다.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "번호"
 
@@ -6640,12 +6644,12 @@ msgstr "/메시지(_M)/모든 계정에서 받기(_a)"
 msgid "_Send queued messages"
 msgstr "임시 보관된 메시지를 보냅니다"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "이 프로그램은"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "끝내기"
diff --git a/po/lt.po b/po/lt.po
index aa5645b0..d25a7e0e 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -18,195 +18,195 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Skaitoma kiekvienos sąskaitos konfigūracija...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 prisijungimas prie %s buvo nutrauktas. Jungiamasi...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 serveris panaikina LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "sukuriamas IMAP4 prisijungimas prie %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Negaliu sukurti TLS sesijos.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Trinama žinutė %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Siunčiu laišką (%d / %d baitai)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopijuoju žinutę %s%c%d į %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Gaunamos žinutės iš %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "negaliu nustatyti ištrynimo žymų: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "negaliu išbraukti\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Gaunamos žinutės iš %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "negaliu nustatyti ištrynimo žymų: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "negaliu uždaryti katalogo\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "šakninis katalogas %s neegzistuoja\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "klaida gaunant LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Negaliu sukurti „%s“\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "negaliu sukurti „%s“ po INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "negaliu sukurti dėžutės: nepavyko LIST\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "negaliu sukurti dėžutės\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "negaliu pervadinti dėžutės: %s į %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "negaliu ištrinti dėžutės\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "nagaliu gauti voko\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Siunčiu laišką (%d / %d baitai)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "klaida gaunant voką.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "negaliu išanalizuoti voko: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Negaliu prisijungti prie IMAP4 serverio: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Negaliu sukurti IMAP4 sesijos su: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "negalių gauti vardų zonos\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "negaliu pasirinkti katalogo: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentiškumo tikrinimas nepavyko.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "nepavyko prisijungti prie IMAP4\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "negaliu prirašyti %s į %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(siunčiama byla...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "negaliu prirašyti žinutės į %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "negaliu nukopijuoti %s į %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "klaida vykdant imap komandą: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "klaida vykdant imap komandą: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "klaida vykdant imap komandą: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv negali konvertuoti UTF-7 į %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv negali konvertuoti %s į UTF-7\n"
@@ -712,7 +712,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Vardas"
@@ -966,9 +966,9 @@ msgstr "/Naujas _katalogas"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -977,7 +977,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Taisyti"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Ištrinti"
 
@@ -990,7 +990,7 @@ msgid "Address book"
 msgstr "Adresų knyga"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Vardas:"
 
@@ -1013,16 +1013,16 @@ msgstr "Pridėti"
 msgid "Lookup"
 msgstr "Ieškoti"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kam:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopija:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slapta kopija:"
 
@@ -1044,7 +1044,7 @@ msgstr ""
 "Ar tikrai norite pašalinti katalogą „%s“ ir visus adresus jame? \n"
 "Jei pašalinsite tik katalogą, adresai bus perkelti į aukštesnįjį katalogą."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Ištrinti katalogą"
 
@@ -1248,7 +1248,7 @@ msgstr "Ruda"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Nieko"
 
@@ -1339,7 +1339,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Taisyti/_Automatiškai laužyti"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Rodyti"
 
@@ -1569,7 +1569,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Negaliu gauti sudėtinės žinutės dalies"
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Nėra temos)"
 
@@ -1691,7 +1691,7 @@ msgstr "MIME tipas"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Dydis"
 
@@ -1780,7 +1780,7 @@ msgstr "Savybės"
 msgid "Encoding"
 msgstr "Koduotė"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Kelias"
 
@@ -2001,12 +2001,12 @@ msgstr "Redaguoti katalogą"
 msgid "Input the new name of folder:"
 msgstr "Įveskite katalogo pavadinimą:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Naujas katalogas"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Įveskite naujo katalogo pavadinimą:"
 
@@ -2174,42 +2174,42 @@ msgstr "Pasirinkti katalogą"
 msgid "Select folder"
 msgstr "Pasirinkti katalogą"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gaunami"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Išsiųsti"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Eilė"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Šiukšlinė"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Juodraščiai"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NaujasKatalodas"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "„%c“ negali būti katalogo pavadinime."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalogas „%s“ egzistuoja."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Negaliu sukurti katalogo „%s“."
@@ -2277,7 +2277,7 @@ msgstr "Nauji"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Nesk."
 
@@ -2327,22 +2327,22 @@ msgstr "Tikrinamos naujos žinutės visuose kataloguose..."
 msgid "Junk"
 msgstr "Nereikalingas"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pažymėtas katalogas „%s“\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Siunčiamos žinutės („%s“)..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Klaida siunčiant žinutes („%s“)."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2352,26 +2352,26 @@ msgstr ""
 "(jei norite sukurti katalogą talpinti pakatalogiams,\n"
 " pridėkite „/“ prie vardo pabaigos)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Įveskite naują „%s“ pavadinimą:"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Pervadinti katalogą"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Negaliu perkelti katalogo „%s“"
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2380,12 +2380,12 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ištrinti katalogą"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2398,21 +2398,21 @@ msgstr ""
 "\n"
 "Ar tikrai norite ištrinti?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Negaliu pašalinti katalogo „%s“"
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Išvalyti šiukšlinę"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Ištrinti visas žinutes šiukšlinėje?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2421,34 +2421,34 @@ msgstr ""
 "Ar tikrai pašalinti dėžutę „%s“ ?\n"
 "(žinutės NEBUS ištrintos iš disko)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Pašalinti dėžutę"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ar tikrai ištrinti IMAP4 sąskaitą „%s“?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Ištrinti IMAP4 sąskaitą"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ar tikrai ištrinti naujienų grupę „%s“?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Ištrinti naujienų grupę"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ar tikrai pašalinti naujienų sąskaitą „%s“?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Pašalinti naujienų sąskaitą"
 
@@ -2464,7 +2464,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Sukuria antraščių peržiūra...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Nėra gavėjo)"
 
@@ -3246,7 +3246,7 @@ msgstr "/_Rodyti/Simbolių ko_duotė/Kinų (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Rodyti/Simbolių ko_duotė/Korėjiečių (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Rodyti/Atverti naujame _lange"
 
@@ -3526,8 +3526,8 @@ msgstr "Kuriamas pagrindinis langas..\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: nepavyko spalvos priskyrimas %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "atlikta.\n"
 
@@ -3602,7 +3602,7 @@ msgstr "Sylpheed - Katalogų peržiūra"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Žinutės peržiūra"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Atsakyti"
 
@@ -3618,15 +3618,15 @@ msgstr "/Atsakyti _siuntėjui"
 msgid "/Reply to mailing _list"
 msgstr "/Atsakyti _konferencijai"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Persiųsti"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Pe_rsiųsti kaip priedą"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Nukreip_ti"
 
@@ -3711,8 +3711,8 @@ msgstr "Nustatymai"
 msgid "Common preferences"
 msgstr "Bendri nustatymai"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Sąskaita"
 
@@ -3744,7 +3744,7 @@ msgstr "Rasti žinutėje"
 msgid "Find text:"
 msgstr "Rasti tekstą:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Skirti didžiąsias-mažąsias raides"
@@ -3789,25 +3789,25 @@ msgstr "Priedai"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Negaliu išsaugoti bylos „%s“."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Mokymosi komanda"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Spausdinti"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4178,7 +4178,7 @@ msgstr "Prieš siunčiant patikrinti autentiškumą su POP3"
 msgid "Command output"
 msgstr "Komandos išvestis"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatiškai nustatyti sekančius adresus"
 
@@ -5459,7 +5459,7 @@ msgstr "Komandos rezultatas"
 msgid "Age"
 msgstr "Amžius"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Žyma"
@@ -5624,36 +5624,36 @@ msgstr "Veiksmas neegzistuoja."
 msgid "Folder properties"
 msgstr "Katalogo savybės"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Simbolis"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tipas"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Įprastas"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nerodyti [...] arba (...) temos pradžioje santraukoje"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Atsakant ištrinti [...] arba (...) temos pradžioje"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Pritaikyti ir pakatalogiams"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "naudoti ir atsakant"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Atsakyti kam:"
 
@@ -5662,20 +5662,20 @@ msgstr "Atsakyti kam:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Jei teisingas bet kuris"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Jei teisingi visi"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Katalogas"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Paieška nepavyko"
@@ -5691,19 +5691,19 @@ msgstr "Priedas"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Siuntėjas"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Data"
 
@@ -6098,7 +6098,7 @@ msgstr "Negaliu gauti naujienų grupių sąrašo."
 msgid "Can't retrieve newsgroup list."
 msgstr "Negaliu gauti naujienų grupių sąrašo."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Atlikta."
 
@@ -6126,7 +6126,7 @@ msgstr "Skanuojamas katalogas „%s“..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtruojama..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Be datos)"
 
@@ -6144,351 +6144,355 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Bylos vardas"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Atsak_yti"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Atsak_yti/_visiems"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Atsak_yti/_siuntėjui"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Atsak_yti/_konferencijai"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/Per_kelti..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopijuoti..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/Žy_ma"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/Žy_ma/Žy_mėti"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/Žy_ma/_Nežymėti"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/Žy_ma/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Žy_ma/Žymėti n_eskaityta"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Žy_ma/Žymėti skai_tyta"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/Žy_ma/Žymėti _visas skaitytomis"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Spa_lva"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/R_edaguoti"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/Pridėti siuntėją į adresų _knygą"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/_Automatiškai"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Siuntėją"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Gavėją"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Į_rankiai/Sukurti filtravimo _taisyklę/pagal _Temą"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Rodyti/P_radinis tekstas"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Rodyti/_Visos antraštės"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/S_pausdinti..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Sukuriamas santraukos vaizdas...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Spa_lva"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Priedas"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Paieška "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Vykdyti žymą"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Palikta žymių. Vykdyti jas?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanuojamas katalogas (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "_Ieškoti dar kartą"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Daugiau nėra neskaitytų žinučių."
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Nėra neskaitytų žinučių. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Nėra neskaitytų žinučių."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Nėra neskaitytų žinučių. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Daugiau nėra naujų žinučių."
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Nėra naujų žinučių. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Nėra naujų žinučių."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Nėra naujų žinučių. Eiti į kitą katalogą?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Daugiau nėra pažymėtų žinučių"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Nėra pažymėtų žinučių. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Nėra pažymėtų žinučių."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nėra pažymėtų žinučių. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Daugiau nėra žinučių su etiketėmis"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Nėra žinučių su etiketėmis. Ieškoti nuo pabaigos?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Nėra žinučių su etiketėmis."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nėra žinučių su etiketėmis. Ieškoti nuo pradžios?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Žinutės pritraukiamos pagal temą..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d ištrinta"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d perkelta"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d nukopijuota"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " objektas(-ai) pažymėti"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nauji: %d, neskaityti: %d, viso: %d (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nauji: %d, neskaityti: %d, viso: %d"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Rikiuojama santrauka..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tNustatoma santrauka iš žinutės duomenų..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Nustatoma santrauka iš žinutės duomenų..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Rašoma santraukos laikinoji atmintis (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Žinutė %d pažymėta\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Žinutė %d pažymėta skaityta\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Žinutė %d pažymėta neskaityta\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Žinutė %s/%d pažymėta trinimui\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Ištrinti žinutę(-es)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ar tikrai norite ištrinti žinutes iš šiukšlinės?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Trinamos identiškos žinutės..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Žinutė %s/%d atžymėta\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Žinutė %d pažymėta perkėlimui į %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Žinutė %d pažymėta kopijavimui į %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "Kopijavimo paskirtis yra tas pats katalogas."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Klaida vykdant operacijas su žinutėmis."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Statomos gijos..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Griaunamos gijos..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtruojama..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtruojama..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "Filtruota žinučių: %d"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Nr."
 
@@ -6561,12 +6565,12 @@ msgstr "/Ži_nutė/_Gauti/Gauti iš _visų sąskaitų"
 msgid "_Send queued messages"
 msgstr "Siųsti laiškus eilėje"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Apie"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Išeiti"
diff --git a/po/nl.po b/po/nl.po
index 33b705c3..9d892617 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2003-02-18 13:03--100\n"
 "Last-Translator: Vincent van Adrighem <V.vanAdrighem@dirck.mine.nu>\n"
 "Language-Team: Dutch <vertaling@nl.linux.rg>\n"
@@ -18,204 +18,204 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Accountinstellingen worden ingelezen...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "IMAP4 verbinding naar %s:%d is verbroken. Contact wordt opnieuw gelegd...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP server-map"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "IMAP4 verbinding naar %s:%d wordt opgezet...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Kan geen TLS sessie starten.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Bezig met verwijderen van bericht %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Bericht %s%c%d wordt verplaatst naar %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Bericht %s%c%d wordt gekopieerd naar %s...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan verwijderde vlaggen: %d niet instellen\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "kan niet wissen\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Berichten worden van %s naar %s opgehaald...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan de vlaggen \"verwijderd\" : 1.%d niet instellen\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Markeerbestand is niet gevonden\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "er is een fout opgetreden tijdens het ophalen van de LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr ""
 "kan %s niet aanmaken\n"
 "\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan %s niet aanmaken onder INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "Ik kan geen mailbox maken: LIST mislukt\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "Ik kan geen mailbox maken\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan de mailbox niet hernoemen van %s naar %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "Ik kan de mailbox niet verwijderen\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "Ik kan de envelope niet verkrijgen\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Bezig met verzenden van bericht (%d / %d bytes)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "Er is een fout opgetreden bij het verkrijgen van de envelope.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "Ik kan de envelope niet verwerken: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan niet verbinden met de IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan gaan sessie opzetten met de IMAP4 server: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "kan de NAMESPACE niet vinden\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan map niet selecteren: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Identificatiemethode"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login mislukt.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan %s niet toevoegen aan %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(bestand wordt verzonden...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "kan bericht %s niet toevoegen\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan %d niet naar %s kopiëren\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "Fout tijdens IMAP opdracht: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "Fout tijdens IMAP opdracht: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan UTF-7 niet naar %s omzetten\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan %s niet naar UTF-7 omzetten\n"
@@ -724,7 +724,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Naam"
@@ -978,9 +978,9 @@ msgstr "/Nieuwe _map"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -989,7 +989,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/Be_werken"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/Ver_wijderen"
 
@@ -1002,7 +1002,7 @@ msgid "Address book"
 msgstr "Adresboek"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Naam:"
 
@@ -1025,16 +1025,16 @@ msgstr "Toevoegen"
 msgid "Lookup"
 msgstr "Zoeken"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Aan:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1057,7 +1057,7 @@ msgstr ""
 "Als u alleen de map verwijdert, dan zullen de adressen naar de \n"
 "hoger gelegen map verplaatst worden."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Verwijder map"
 
@@ -1266,7 +1266,7 @@ msgstr "Bruin"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Geen"
 
@@ -1362,7 +1362,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/B_ewerken/_Kopiëren"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/B_eeld"
 
@@ -1619,7 +1619,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ik kan het deel van een meerdelig bericht niet ophalen."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Geen onderwerp)"
 
@@ -1741,7 +1741,7 @@ msgstr "MIME type"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Grootte"
 
@@ -1830,7 +1830,7 @@ msgstr "Eigenschappen"
 msgid "Encoding"
 msgstr "Codering"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pad"
 
@@ -2057,12 +2057,12 @@ msgstr "Map hernoemen"
 msgid "Input the new name of folder:"
 msgstr "Geef de nieuwe naam van de map:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nieuwe map"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Geef de naam van de nieuwe map:"
 
@@ -2231,42 +2231,42 @@ msgstr "Map voor de lokale mail"
 msgid "Select folder"
 msgstr "Selecteer map"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Verzonden"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Wachtrij"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Klad"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NieuweMap"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' mag niet in de naam van een map."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "De map '%s' bestaat al."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan map '%s' niet aanmaken."
@@ -2337,7 +2337,7 @@ msgstr "Nieuw"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Ongelezen"
 
@@ -2388,22 +2388,22 @@ msgstr "Bezig met controleren op nieuwe berichten in alle mappen..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Map %s is geselecteerd\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Bezig met verzenden van bericht"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Er is een fout opgetreden bij het versturen van het bericht naar %s."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2413,26 +2413,26 @@ msgstr ""
 "(Als je een map wilt maken om daarin submappen te plaatsen,\n"
 "sluit de naam dan af met een '/')"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Geef een nieuwe naam voor '%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Hernoem map"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2441,12 +2441,12 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Verwijder map"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2457,21 +2457,21 @@ msgstr ""
 "Alle mappen en berichten in '%s' zullen worden verwijderd.\n"
 "Wilt u werkelijk verwijderen?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan map '%s' niet verwijderen."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Prullenbak leegmaken"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Alle berichten uit de prullenbak weggooien?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2480,34 +2480,34 @@ msgstr ""
 "Wilt u de '%s' mailbox werkelijk verwijderen?\n"
 "(De berichten zelf zullen NIET van de schijf worden verwijderd)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "mailbox verwijderen"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "IMAP4 account '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Verwijder IMAP4 account"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Nieuwsgroep '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Verwijder nieuwsgroep"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Nieuwsaccount '%s' werkelijk verwijderen?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Verwijder nieuwsaccount"
 
@@ -2523,7 +2523,7 @@ msgstr "Onderwerp:"
 msgid "Creating header view...\n"
 msgstr "Header view wordt aangemaakt...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Geen afzender)"
 
@@ -3313,7 +3313,7 @@ msgstr "/B_eeld/_Codering/Chinees (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/B_eeld/_Codering/Koreaans (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/B_eeld/Open in _nieuw venster"
 
@@ -3605,8 +3605,8 @@ msgstr "Hoofdvenster wordt aangemaakt...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "HoofdVenster: kleur %d kon niet gealloceerd worden\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "klaar.\n"
 
@@ -3683,7 +3683,7 @@ msgstr "Sylpheed - Mappenoverzicht"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Berichtenoverzicht"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Antwoord"
 
@@ -3702,15 +3702,15 @@ msgstr "/Ant_woord sturen aan/_afzender"
 msgid "/Reply to mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/D_oorsturen"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Doorsturen als _bijvoeging"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/_Omleiden"
 
@@ -3796,8 +3796,8 @@ msgstr "Voork."
 msgid "Common preferences"
 msgstr "Algemene voorkeuren"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Account"
 
@@ -3829,7 +3829,7 @@ msgstr "Zoek in huidig bericht"
 msgid "Find text:"
 msgstr "Zoek naar:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Hoofdlettergevoelig"
@@ -3874,25 +3874,25 @@ msgstr "Bijvoegingen"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan het bestand '%s' niet opslaan."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Uitvoeren"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Afdrukken"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4272,7 +4272,7 @@ msgstr "Identificatie met POP3 voor het verzenden"
 msgid "Command output"
 msgstr "Opdracht"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Stel automatisch de volgende adressen in"
 
@@ -5580,7 +5580,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Gemarkeerd"
@@ -5766,39 +5766,39 @@ msgstr "%s: bestand bestaat niet\n"
 msgid "Folder properties"
 msgstr "Mapeigenschappen"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Selecteer"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Type"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normaal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 "Geen [...] of (...) weergeven aan het begin van het onderwerp in de "
 "berichtenlijst"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 "[...] of (...) verwijderen aan het begin van het onderwerp bij beantwoorden"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Toepassen op submappen"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "ook gebruiken bij beantwoorden"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Antwoord-Aan:"
 
@@ -5807,21 +5807,21 @@ msgstr "Antwoord-Aan:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Stel automatisch de volgende adressen in"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Accounts"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Zoeken mislukt"
@@ -5837,19 +5837,19 @@ msgstr "Bijvoeging"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Onderwerp"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Afzender"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Datum"
 
@@ -6242,7 +6242,7 @@ msgstr "Kan geen nieuwsgroep opvragen."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan geen nieuwsgroep opvragen."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Klaar."
 
@@ -6270,7 +6270,7 @@ msgstr "Bezig met inlezen van map %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Bezig met filteren..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Geen datum)"
 
@@ -6288,351 +6288,355 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Bestandsnaam"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Ant_woord sturen aan"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Ant_woord sturen aan/_iedereen"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Ant_woord sturen aan/_afzender"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Ant_woord sturen aan/_mailinglijst"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Verplaats..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopieer..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Markeren"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Markeren/_Markeren"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Markeren/D_emarkeren"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Markeren/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markeren/Als _ongelezen"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markeren/Als _gelezen"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markeren/_Alles als gelezen"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Kle_urlabel"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Be_werken"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Afz_ender toevoegen aan adresboek"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/F_ilterregel aanmaken"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/F_ilterregel aanmaken/_Automatisch"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/F_ilterregel aanmaken/op _Afzender"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/F_ilterregel aanmaken/op _Geadresseerde"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/F_ilterregel aanmaken/op _Onderwerp"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/B_eeld/Bekijk broncode"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/B_eeld/Vo_lledige header"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Afdrukken..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Venster Berichtenlijst wordt aangemaakt...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Kle_urlabel"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Bijvoeging"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Zoek"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Verwerk markering"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Sommige markeringen zijn nog aanwezig. Verwerken?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Bezig met inlezen van map (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Opnieuw zoeken"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Geen ongelezen berichten meer"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Geen ongelezen berichten."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Geen ongelezen berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Geen nieuwe berichten meer"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Geen nieuw bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Geen nieuwe berichten."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Geen nieuwe berichten gevonden. Doorgaan naar de volgende map?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Geen gemarkeerde berichten meer"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Geen gemarkeerde berichten."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Geen gemarkeerd bericht gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Geen gelabelde berichten meer"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Geen gelabeld bericht gevonden. Zoeken vanaf het einde?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Geen gelabelde berichten."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Geen gelablede berichten gevonden. Zoeken vanaf het begin?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Berichten worden aangetrokken op onderwerp..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d verwijderd"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d verplaatst"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ","
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d gekopieerd"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr "item(s) geselecteerd"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "nieuw: %d, ongelezen:%d, totaal: %d"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Lijst wordt gesorteerd..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\t"
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Samenvatting wordt ingesteld van berichtinformatie..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Samenvattingbuffer wordt weggeschreven (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bericht %d is gemarkeerd\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bericht %d is gemarkeerd als 'wordt gelezen'.\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bericht %d is gemarkeerd als ongelezen\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bericht %s/%d staat klaar om verwijderd te worden\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Verwijder bericht(en)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr ""
 "Wilt u dit bericht / deze berichten werkelijk verwijderen uit de prullenbak?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Bezig met verwijderen van dubbele berichten..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Bericht %s/%d is gedemarkeerd\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bericht %d staat klaar om verplaatst te worden naar %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bericht %d staat klaar om gekopieerd te worden naar %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Doel is gelijk aan de huidige map."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Fout bij het verwerken van de e-mail"
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Discussies worden bij elkaar gevoegd..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Discussies worden uit elkaar gehaald..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Bezig met filteren..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "bericht %d is reeds gebufferd.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Nr."
 
@@ -6707,12 +6711,12 @@ msgstr "/Be_richt/_Alle e-mail ophalen"
 msgid "_Send queued messages"
 msgstr "Verzend berichten uit de wachtrij"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Info"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Afsluiten"
diff --git a/po/pl.po b/po/pl.po
index 2579978b..3eb2daa0 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -15,197 +15,197 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Odczyt ustawień wszystkich kont...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr ""
 "Połączenie IMAP4 z %s zostało przerwane. Ponowne nawiązywanie połączenia...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Katalog serwera IMAP4."
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "tworzenie połączenia IMAP4 do %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Nie można uruchomić sesji TLS\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Usuwanie wiadomości %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiowanie wiadomości %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Pobieranie wiadomości z %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nie można ustawić flag skasowany: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "nie można zlikwidować\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Pobieranie wiadomości z %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nie można ustawić flagi skasowany: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "nie można zamknąć katalogu\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "brak głównego katalogu %s\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "wystąpił błąd podczas przy pobieraniu LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "nie można utworzyć \"%s\"\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nie można utworzyć \"%s\" w INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nie można utworzyć skrzynki: błąd LIST.\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "nie można utworzyć skrzynki\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nie można zmienić nazwy skrzynki: %s na %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "nie można skasować skrzynki\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "nie można pobrać koperty\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Wysyłanie wiadomości (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "wystąpił błąd podczas pobierania koperty.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "nie można przetworzyć koperty: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nie można nawiązać połączenia z serwerem IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nie można ustanowić sesji IMAP4 z: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "nie można pobrać przestrzeni nazw\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "nie można wybrać katalogu: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "Błąd uwierzytelniania IMAP4.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Nie można zalogować się do serwera IMAP4.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nie można dołączyć %s do %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(wysyłanie pliku...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nie można dołączyć wiadomości do %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nie można skopiować %s do %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "wystąpił błąd przy wykonywaniu polecenia IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "nie można skonwertować UTF-7 do %s za pomocą programu iconv\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "nie można skonwertować %s do UTF-7 za pomocą programu iconv\n"
@@ -708,7 +708,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nazwa"
@@ -963,9 +963,9 @@ msgstr "/Nowy _katalog"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -974,7 +974,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Edycja"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Usuń"
 
@@ -987,7 +987,7 @@ msgid "Address book"
 msgstr "Książka adresowa"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Nazwa:"
 
@@ -1010,16 +1010,16 @@ msgstr "Dodaj"
 msgid "Lookup"
 msgstr "Wyszukaj"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Do:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Ukryta kopia:"
 
@@ -1042,7 +1042,7 @@ msgstr ""
 "Jeśli usuniesz tylko katalog, adresy zostaną przeniesione do nadrzędnego "
 "katalogu."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Usuń katalog"
 
@@ -1253,7 +1253,7 @@ msgstr "Brązowy"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Brak"
 
@@ -1344,7 +1344,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Edycja/Aut_o-zawijanie"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Widok"
 
@@ -1574,7 +1574,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nie można pobrać części wiadomości wieloczęściowej."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Bez tematu)"
 
@@ -1694,7 +1694,7 @@ msgstr "typ MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Rozmiar"
 
@@ -1783,7 +1783,7 @@ msgstr "Właściwości"
 msgid "Encoding"
 msgstr "Kodowanie"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Ścieżka"
 
@@ -2008,12 +2008,12 @@ msgstr "Edytuj katalog"
 msgid "Input the new name of folder:"
 msgstr "Podaj nową nazwę katalogu:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nowy katalog"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Podaj nazwę nowego katalogu:"
 
@@ -2181,42 +2181,42 @@ msgstr "Wybierz katalog"
 msgid "Select folder"
 msgstr "Wybierz katalog"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Odebrane"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Wysłane"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kolejka"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Szablony"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "Nowy katalog"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nie może wystąpić w nazwie katalogu."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Katalog '%s' już istnieje."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nie można utworzyć katalog '%s'."
@@ -2285,7 +2285,7 @@ msgstr "Nowy"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Nieprzeczytane"
 
@@ -2335,22 +2335,22 @@ msgstr "Sprawdzanie nowych wiadomości we wszystkich katalogach..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Wybrano katalog %s\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pobieranie wiadomości z %s..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Błąd podczas pobierania wiadomości z `%s'."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2360,26 +2360,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:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Wprowadź nową nazwę dla '%s' :"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Zmień nazwę katalogu"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2388,12 +2388,12 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Usuń katalog"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2404,21 +2404,21 @@ msgstr ""
 "Wszystkie katalogi i wiadomości w \"%s\" zostaną usunięte.\n"
 "Czy naprawdę chcesz je usunąć?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Nie można usunąć katalogu \"%s\"."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Opróżnij śmietnik"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Czy usunąć wszystkie wiadomości ze śmietnika?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2427,34 +2427,34 @@ msgstr ""
 "Czy naprawdę usunąć skrzynkę \"%s\" ?\n"
 "(Wiadomości NIE zostaną usunięte z dysku)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Usuń skrzynkę"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto IMAP4 \"%s\" ?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Usuń konto IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Czy naprawdę chcesz usunąć grupę dyskusyjną \"%s\"?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Usuń grupę dyskusyjną"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Czy naprawdę chcesz usunąć konto grup dyskusyjnych \"%s\"?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Usuń konto grup dyskusyjnych"
 
@@ -2470,7 +2470,7 @@ msgstr "Temat:"
 msgid "Creating header view...\n"
 msgstr "Tworzenie widoku nagłówków...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Bez Od)"
 
@@ -3243,7 +3243,7 @@ msgstr "/_Widok/Kodowani_e znaków/Chińskie (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Widok/Kodowani_e znaków/Koreańskie (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/W_Widok/Ot_wórz w nowym oknie"
 
@@ -3527,8 +3527,8 @@ msgstr "Tworzenie głównego okna...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Okno główne: błąd alokacji kolorów %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "gotowe.\n"
 
@@ -3604,7 +3604,7 @@ msgstr "Sylpheed - Widok Katalogów"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Widok Wiadomości"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Odpowiedz"
 
@@ -3620,15 +3620,15 @@ msgstr "/Odpowiedz nadawcy"
 msgid "/Reply to mailing _list"
 msgstr "/Odpowiedz _liście dyskusyjnej"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Prze_każ"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Przekaż jako załącznik"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Prze_kieruj"
 
@@ -3714,8 +3714,8 @@ msgstr "Preferencje"
 msgid "Common preferences"
 msgstr "Wspólne preferencje "
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -3747,7 +3747,7 @@ msgstr "Znajdź w bieżącej wiadomości"
 msgid "Find text:"
 msgstr "Znajdź tekst:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Rozróżnianie wielkości liter"
@@ -3792,25 +3792,25 @@ msgstr "Załączniki"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nie można zapisać pliku \"%s\"."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Wynik polecenia"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Drukuj"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4186,7 +4186,7 @@ msgstr "Uwierzytelnianie POP3 przed wysyłaniem"
 msgid "Command output"
 msgstr "Wyjście polecenia"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatyczne ustawianie następujących adresów"
 
@@ -5473,7 +5473,7 @@ msgstr "Wynik polecenia"
 msgid "Age"
 msgstr "Wiek"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Zaznacz"
@@ -5640,36 +5640,36 @@ msgstr "Akcja nie istnieje."
 msgid "Folder properties"
 msgstr "Właściwości katalogu"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Wyszczególniacz"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Typ"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Zwykłe"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nie wyświetlaj [...] lub (...) na początku tematu przy podsumowaniu"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Usuń [...] lub (...) z początku tematu przy odpowiedzi"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Stosowane także do podkatalogów"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "użycie także przy odpowiadaniu"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Adres zwrotny:"
 
@@ -5678,21 +5678,21 @@ msgstr "Adres zwrotny:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Dopasuj wszystkie"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Katalog"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Błąd wyszukiwania"
@@ -5708,19 +5708,19 @@ msgstr "Załącznik"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Temat"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Data"
 
@@ -6111,7 +6111,7 @@ msgstr "Nie można pobrać listy grup dyskusyjnych."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nie można pobrać listy grup dyskusyjnych."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Gotowe."
 
@@ -6139,7 +6139,7 @@ msgstr "Przeszukiwanie katalogu %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Bez daty)"
 
@@ -6157,369 +6157,373 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Nazwa pliku"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Odpowied_z"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Odpowied_z/wszystki_m"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Odpowied_z/nadawc_y"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odpowied_z/_liście dyskusyjnej"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Przenieś..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopiuj..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Zaznacz"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Zaznacz/_Zaznacz"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Zaznacz/_Odznacz"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Zaznacz/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Zaznacz/Zaznacz jako niep_rzeczytane"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Zaznacz/Zaznacz jako prz_eczytane"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Zaznacz/Zaznacz wszystkie jako prz_eczytane"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Kolor etykiety"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Prz_eedytuj"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dodaj nadawcę do _książki adresowej"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Automatycznie"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Od"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Do"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Narzędzia/_Utwórz regułę filtrowania/_Temat"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Widok/Źródł_o"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Widok/Wszystkie na_główki"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Drukuj..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Tworzenie widoku podsumowania...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Kolor etykiety"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Załącznik"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Szukaj "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Znacznik procesu"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "brak niektórych znaczników, czy wykonać ?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Skanowanie katalogu (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Szukaj ponownie"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Nie ma więcej nieprzeczytanych wiadomości"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Brak nieprzeczytanych wiadomości."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nieprzeczytanych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Nie ma więcej nowych wiadomości"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Brak nowych wiadomości"
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nie znaleziono nowych wiadomości.\n"
 "Czy przejść do następnego folderu?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Nie ma więcej zaznaczonych wiadomości"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpoczać wyszukiwanie od końca?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Brak zaznaczonych wiadomości"
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono zaznaczonych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Nie ma więcej etykietowanych wiadomości"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od końca?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Brak etykietowanych wiadomości."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 "Nie znaleziono etykietowanych wiadomości.\n"
 "Czy rozpocząć wyszukiwanie od początku?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Łączenie wiadomości wg tematu..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d przeniesiono"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopiowano"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " element(ów) wybrany(o)"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nowych, %d nieprzeczytanych, razem %d (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nowych, %d nieprzeczytanych, %d razem"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Sortowanie podsumowania..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tUstawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Ustawianie podsumowania z danych wiadomości..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisywanie cache podsumowania (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Wiadomość %d zaznaczona\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Wiadomość %d zaznaczona jako przeczytana\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Wiadomość %d zaznaczona jako nieprzeczytana\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Wiadomość %s/%d ustawiona do usunięcia\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Usuń wiadomość"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Czy naprawdę chcesz usunąć wiadomości z kosza?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Kasowanie powielonych wiadomości..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Wiadomość %s/%d niezaznaczona\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Wiadomość %d ustawiona do przesunięcia do %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Katalog docelowy taki sam jak bieżący."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Wiadomość %d ustawiona do kopiowania do %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "Katalog docelowy kopiowania jest taki sam jak bieżący."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Błąd podczas przetwarzania wiadomości."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Tworzenie wątków..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Odwątkowanie .."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtrowanie..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtowanie..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d wiadomość(i) przefiltrowano."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Nr"
 
@@ -6592,12 +6596,12 @@ msgstr "/Wiado_mość/Odbier_z/Pobierz ze _wszystkich kont"
 msgid "_Send queued messages"
 msgstr "Wyślij wiadomości z kolejki"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "O programie"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Koniec programu"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index ff6d745d..49af3a2e 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2006-01-05 09:40-0300\n"
 "Last-Translator: Ricardo Nabinger Sanchez <rnsanchez@gmail.com>\n"
 "Language-Team: André Casteliano <digitalcoder@users.sourceforge.net> Isaías "
@@ -21,194 +21,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Lendo as configurações de cada conta...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "A conexão IMAP4 com %s terminou. Reconectando...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "servidor IMAP4 desabilita LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "criando conexão IMAP4 com %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Não foi possível iniciar sessão TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "Buscando mensagem %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Adicionando mensagens em %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Movendo mensagens %s para %s ..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiando mensagesn %s para %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "Removendo mensagens %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "não posso marcar como apagado: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "não posso eliminar\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Removendo todas as mensagens em %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "não posso marcar como apagado: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "não posso fechar pasta\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "pasta raiz %s inexistente\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "erro recebendo resultados do LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Não foi possível criar '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "não foi possível criar '%s' em baixo da INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "não posso criar caixa de correio: LIST falhou\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "não posso criar caixa de correio\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "não é possível renomear caixa de correio: %s para %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "não posso apagar caixa de correio\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Buscando cabeçalhos das mensagens (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "Ocorreu um erro ao obter 'envelope'\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "não foi possível realizar o parse no envelope: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Não foi possível se conectar ao servidor IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Não foi possível estabelecer uma sessão IMAP4 com: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "Não foi possível obter o 'envelope'\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "não posso selecionar pasta: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "erro no comando imap: STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "Falha na autenticação IMAP4.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Falha ao logar no servidor IMAP4.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "não foi possível copiar a mensagem %s para %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(enviando arquivo...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "não foi possível anexar a mensagem em %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "não posso copiar %s para %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "erro no comando imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "erro no comando imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "erro no comando imap: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "o iconv não pode converter UTF-7 para %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "o iconv não pode converter %s para UTF-7\n"
@@ -713,7 +713,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nome"
@@ -967,9 +967,9 @@ msgstr "/Nova _Pasta"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -978,7 +978,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Editar"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Apagar"
 
@@ -991,7 +991,7 @@ msgid "Address book"
 msgstr "Catálogo de endereços"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Nome:"
 
@@ -1014,16 +1014,16 @@ msgstr "Adicionar"
 msgid "Lookup"
 msgstr "Procurar"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Para:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Cco:"
 
@@ -1045,7 +1045,7 @@ msgstr ""
 "Você quer apagar a pasta E todos os endereços em `%s' ?\n"
 "Caso apague somente a pasta, os endereços serão movidos para a pasta pai."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Apagar pasta"
 
@@ -1254,7 +1254,7 @@ msgstr "Marrom"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Nenhuma"
 
@@ -1345,7 +1345,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editar/_Quebra automática de linha"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/E_xibir"
 
@@ -1573,7 +1573,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Não foi possível obter alguma(s) parte(s) dessa mensagem."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Sem assunto)"
 
@@ -1696,7 +1696,7 @@ msgstr "Tipo MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Tamanho"
 
@@ -1785,7 +1785,7 @@ msgstr "Propriedades"
 msgid "Encoding"
 msgstr "Codificação"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Caminho"
 
@@ -2006,12 +2006,12 @@ msgstr "Editar pasta"
 msgid "Input the new name of folder:"
 msgstr "Nome da nova pasta:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nova pasta"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Digite o nome da nova pasta:"
 
@@ -2180,42 +2180,42 @@ msgstr "Selecionar diretório"
 msgid "Select folder"
 msgstr "Selecione uma pasta"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Caixa de Entrada"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Enviadas"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Fila de saída"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Lixeira"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Rascunhos"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NovaPasta"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' não pode ser usado no nome da pasta."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "A pasta `%s' já existe."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "não foi possível criar a pasta `%s'."
@@ -2282,7 +2282,7 @@ msgstr "Nova"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Não lido"
 
@@ -2332,22 +2332,22 @@ msgstr "Checar novas mensagens em todas as pastas..."
 msgid "Junk"
 msgstr "Spam"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Pasta %s selecionada\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Recebendo mensagens em %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Erro ao receber mensagens em `%s'."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2357,26 +2357,26 @@ msgstr ""
 "(se você quer criar uma pasta para armazenar subpastas.\n"
 " adicione `/' no final do nome)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Novo nome para `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Renomear pasta"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Não foi possível mover a pasta `%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2386,11 +2386,11 @@ msgstr ""
 "As mensagens reais não serão apagadas.\n"
 "Deseja apagar a pasta?"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 msgid "Delete search folder"
 msgstr "Apagar pasta de busca"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2403,20 +2403,20 @@ msgstr ""
 "\n"
 "Quer realmente apagá-las?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Não foi possível excluir a pasta `%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Esvaziar lixeira"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "Apagar todas as mensagens da lixeira?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2425,34 +2425,34 @@ msgstr ""
 "Realmente remover a caixa de correio `%s' ?\n"
 "(As mensagens NÃO são apagadas do disco)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Remover caixa de correio"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Realmente apagar conta IMAP4 `%s' ?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Apagar conta IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Apagar grupo de notícias"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Realmente apagar o grupo de notícias `%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Apagar conta de grupo de notícias"
 
@@ -2468,7 +2468,7 @@ msgstr "Assunto:"
 msgid "Creating header view...\n"
 msgstr "Criando visualizador de cabeçalhos...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Sem remetente)"
 
@@ -3249,7 +3249,7 @@ msgstr "/E_xibir/_Codificação de caracteres/Chinês (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/E_xibir/_Codificação de caracteres/Coreano (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/E_xibir/Abrir em uma n_ova janela"
 
@@ -3529,8 +3529,8 @@ msgstr "Criando janela principal...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "MainWindow: falhou ao alocar cores %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "Pronto.\n"
 
@@ -3604,7 +3604,7 @@ msgstr "Sylpheed - Visão de Pastas"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Visão de Mensagens"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Responder"
 
@@ -3620,15 +3620,15 @@ msgstr "/Responder para o _remetente"
 msgid "/Reply to mailing _list"
 msgstr "/Responder para a /_lista"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/En_caminhar"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Encaminhar como ane_xo"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Re_direcionar"
 
@@ -3713,8 +3713,8 @@ msgstr "Preferências"
 msgid "Common preferences"
 msgstr "Preferências comuns"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Conta"
 
@@ -3746,7 +3746,7 @@ msgstr "Encontrar na mensagem atual"
 msgid "Find text:"
 msgstr "Encontrar texto:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Maiús./minús."
@@ -3791,24 +3791,24 @@ msgstr "Anexos"
 msgid "Message View - Sylpheed"
 msgstr "Visualização da Mensagem - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Não foi possível salvar arquivo `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr "A mensagem será impressa com o seguinte comando:"
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 msgid "(Default print command)"
 msgstr "(Comando padrão de impressão)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Imprimir"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4179,7 +4179,7 @@ msgstr "Autenticar com POP3 antes de enviar"
 msgid "Command output"
 msgstr "Saída de comando"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Estabelecer os seguintes endereços automaticamente"
 
@@ -5453,7 +5453,7 @@ msgstr "Resultado de comando"
 msgid "Age"
 msgstr "Idade"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Marca"
@@ -5618,35 +5618,35 @@ msgstr "Ação inexistente."
 msgid "Folder properties"
 msgstr "Propriedades da pasta"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "Identificador"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tipo"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Não mostrar [...] ou (...) no início do assunto no sumário"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Remover [...] ou (...) do começo do assunto na resposta"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Aplicar nas subpastas"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "Usar também ao responder"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Responder para:"
 
@@ -5655,19 +5655,19 @@ msgstr "Responder para:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Casar qualquer um dos seguintes"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Casar todos os seguintes"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 msgid "Folder:"
 msgstr "Pasta:"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 msgid "Search subfolders"
 msgstr "Procurar nas sub-pastas"
 
@@ -5682,19 +5682,19 @@ msgstr "Anexo"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Assunto"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "De"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Data"
 
@@ -6087,7 +6087,7 @@ msgstr "Recebendo lista de newsgroups..."
 msgid "Can't retrieve newsgroup list."
 msgstr "Não foi possível obter a lista de grupos de notícias."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Feito."
 
@@ -6114,7 +6114,7 @@ msgstr "Procurando %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Procurando %s (%d / %d)..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Sem data)"
 
@@ -6130,346 +6130,350 @@ msgstr "Local:"
 msgid "Folder name:"
 msgstr "Nome da pasta:"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "Responder para"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "Responder para/_todos"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "Res_ponder para/_quem enviou"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "Responder para/_lista"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/M_over..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Copiar..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Marcar"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Marcar/_Marcar"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcar/_Desmarcar"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Marcar/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcar/Marcar como _não lida"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcar/Marcar como _lida"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcar/Marcar _todas como lidas"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Cor de _identificação"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Re-_editar"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/Adicionar remetente ao _catálogo de endereços"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/_Criar regra de filtro"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Criar regra de filtro/_Automaticamente"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Criar regra de filtro/pelo _remtente"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Criar regra de filtro/pelo _destinatário"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Criar regra de filtro/pelo A_ssunto"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/E_xibir/_Fonte"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/E_xibir/_Todos os cabeçalhos"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Imprimir..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Criando visualizador de sumários...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Cor de _identificação"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Anexo"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Procurar"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Procesar marca"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Algumas marcas foram deixadas. Processá-las?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Revisando pasta (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "Procurar _novamente"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Não há mais mensagens não lidas"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Nenhuma mensagens não lidas encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Não há mensagens não lidas."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Não há mensagens não lidas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Não há mais mensagens novas"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Nenhuma mensagens nova encontrada. Procurar a partir do fim?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Não há mensagens novas."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Não há mensagens novas. Ir para a próxima pasta?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Não há mais mensagens marcadas"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Não há mensagens marcadas"
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Não foram encontradas mensagens marcadas. Procurar a partir do início?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Não há mais mensagens etiquetadas"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Não foram encontradas mensagens etiquetadas. Procurar a partir do fim?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Não há mensagens etiquetadas."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nenhuma mensagem não lida encontrada. Procurar do início ?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Agrupando mensagens por assunto..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d apagadas"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d movidas"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d copiadas"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " item(ns) selecionado(s)"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novas, %d não lidas, %d  no total (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novas, %d não lidas, %d no total"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Ordenando resumos..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tConfigurando resumo a partir dos dados das mensagens..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Configurando resumo a partir dos dados das mensgens..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Gravando cache de resumo (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mensagem %d marcada\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mensagem %d marcada como sendo lida\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mensagem %d marcada como não lida\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mensagem %s/%d marcada para deleção\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Apagar a(s) mensagem(s)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Quer realmente apagar a(s) mensagem(s) da lixeira?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Apagando mensagens duplicadas..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mensagem %s/%d está desmarcada\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mensagem %d marcada para ser movida para %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "O destino é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mensagem %d está marcada para ser copiada para %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "O destino para cópia é o mesmo que a pasta atual."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Erro ao processar mensagens."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Construindo a hierarquia..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Desfazendo a hierarquia..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrando (%d / %d)..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtrando..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtrando..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mensagem(ns) foram filtradas."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Não."
 
@@ -6542,12 +6546,12 @@ msgstr "/_Mensagem/_Receber/Receber de _todas as contas"
 msgid "_Send queued messages"
 msgstr "Enviar Mensagem(s) da fila"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Sobre"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Sair"
diff --git a/po/ro.po b/po/ro.po
index 6f683967..92b71186 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2000-08-28\n"
 "Last-Translator: Little Dragon <littledragon@altern.org>\n"
 "Language-Team: Little Dragon <littledragon@altern.org>\n"
@@ -17,202 +17,202 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Citire configuraţia conturilor...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Conexiunea IMAP4 la %s:%d a fost întreruptă. Reconectare...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Serverul IMAP4 nu a fost introdus."
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "creare conexiune IMAP4 la %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr ""
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Ştergere mesaj"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Mutare mesaj %s%c%d în %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Copiere mesaj %s%c%d în %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Recepţionare mesaje din %s în %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "marcajul de ştergere nu a putut fi setat: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "ştergere imposibilă\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Recepţionare mesaje din %s în %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "marcajul de ştergere nu a putut fi setat: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Fişierul de marcaje nu a fost găsit.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "a avut loc o eroare la comanda LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, fuzzy, c-format
 msgid "Can't create '%s'\n"
 msgstr "nu poate fi creat %s\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, fuzzy, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "nu poate fi creat %s\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "crearea cutiei poştale a eşuat: LIST a eşuat.\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "crearea cutiei poştale este imposibilă\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, fuzzy, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "cutia poştală nu a putut fi setată: %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "ştergerea cutiei poştale este imposibilă\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "recepţionarea plicului nu a putut fi realizată\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Recepţionare mesaj (%d / %d) (%s / %s octeţi)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "a avut loc o eroare în timpul recepţionării plicului.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "plicul nu poate fi analizat: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Încercarea de conectare la serverul IMAP4 a eşuat: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, fuzzy, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Încercarea de conectare la serverul IMAP4 a eşuat: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "spaţiul de nume nu a putut fi obţinut\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "directorul nu a putut fi selectat: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Autentificare..."
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Logare IMAP4 eşuată.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nu a putut fi adăugat %s la %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 #, fuzzy
 msgid "(sending file...)"
 msgstr "Citire director %s ..."
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "mesajul %s nu a putut fi adăugat\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nu a putut fi copiat %d la %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "eroare comandă IMAP: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "eroare comandă IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr ""
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr ""
@@ -728,7 +728,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Nume"
@@ -984,9 +984,9 @@ msgstr "/_Director nou"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -995,7 +995,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Editare"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/Ş_tergere"
 
@@ -1008,7 +1008,7 @@ msgid "Address book"
 msgstr "Agendă"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr " Nume:"
 
@@ -1031,16 +1031,16 @@ msgstr "Adăugare"
 msgid "Lookup"
 msgstr "Căutare"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "La:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1063,7 +1063,7 @@ msgstr ""
 "adreselor conţinute de el ? Dacă ştergeţi doar directorul, adresele\n"
 "vor fi mutate in directorul părinte."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Ştergere director"
 
@@ -1274,7 +1274,7 @@ msgstr "Maro"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Niciunul"
 
@@ -1373,7 +1373,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Editare/_Copiere"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Vedere"
 
@@ -1635,7 +1635,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Citirea unei parţi din mesajul multipart este imposibilă."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Fără subiect)"
 
@@ -1755,7 +1755,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Dimensiune"
 
@@ -1845,7 +1845,7 @@ msgstr "Proprietate"
 msgid "Encoding"
 msgstr "Codare"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cale"
 
@@ -2072,12 +2072,12 @@ msgstr "Editare director"
 msgid "Input the new name of folder:"
 msgstr "Introduceţi noul nume al directorului:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Director nou"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Introduceţi numele noului director:"
 
@@ -2247,45 +2247,45 @@ msgstr "Director spool"
 msgid "Select folder"
 msgstr "Selectare director"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inbox"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 #, fuzzy
 msgid "Sent"
 msgstr "Trimitere"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Lista de aşteptare"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Gunoi"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 #, fuzzy
 msgid "Drafts"
 msgstr "Salvare"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 #, fuzzy
 msgid "NewFolder"
 msgstr "Director nou"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "'%c' nu poate fi inclus în numele directorului."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Directorul '%s' există deja."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
@@ -2361,7 +2361,7 @@ msgstr "Nou"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Necitit"
 
@@ -2415,22 +2415,22 @@ msgstr "/Verificare _mesaje noi"
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Directorul %s este selectat\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Trimitere mesaj"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "A avut loc o eroare la încercarea de a posta mesajul pe %s ."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2440,26 +2440,26 @@ msgstr ""
 "(dacă doriţi crearea de subdirectoare in acest director,\n"
 " adăugaţi un `/' la sfârşitul numelui)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Introduceţi noul nume pentru '%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Redenumire director"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2468,12 +2468,12 @@ msgstr ""
 "Sunteţi sigur că doriţi să ştergeţi cutia poştală '%s'\n"
 "(Mesajele NU sunt şterse de pe disc)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ştergere director"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2484,21 +2484,21 @@ msgstr ""
 "Toate directoarele şi mesajele din '%s' vor fi şterse.\n"
 "Doriţi într-adevăr să continuaţi ?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr ""
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Doriţi ştergerea tuturor mesajelor din gunoi ?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, fuzzy, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2507,35 +2507,35 @@ msgstr ""
 "Sunteţi sigur că doriţi să ştergeţi cutia poştală '%s'\n"
 "(Mesajele NU sunt şterse de pe disc)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 #, fuzzy
 msgid "Remove mailbox"
 msgstr "/Ştergere _cutie poştală"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului IMAP4 '%s' ?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Ştergere cont IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea newsgroupului '%s' ?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Ştergere newsgroup"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Sunteţi sigur că doriţi ştergerea contului de news '%s' ?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Ştergere cont de news"
 
@@ -2551,7 +2551,7 @@ msgstr "Subiect:"
 msgid "Creating header view...\n"
 msgstr "Creare vedere antet...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Fără expeditor)"
 
@@ -3396,7 +3396,7 @@ msgstr "/_Mesaj/Set de _caractere/Chinezesc (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Mesaj/Set de _caractere/Corean (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 #, fuzzy
 msgid "/_View/Open in new _window"
 msgstr "/Deschidere în _fereastră nouă"
@@ -3720,8 +3720,8 @@ msgstr "Creare fereastră principală...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Fereastra principală: alocarea culorii %d a eşuat\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "gata.\n"
 
@@ -3798,7 +3798,7 @@ msgstr ""
 msgid "Sylpheed - Message View"
 msgstr ""
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Răspunde"
 
@@ -3817,16 +3817,16 @@ msgstr "/Răspunde _la toţi"
 msgid "/Reply to mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Î_naintare"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 #, fuzzy
 msgid "/For_ward as attachment"
 msgstr "/Înaintare ca a_taşament"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 #, fuzzy
 msgid "/Redirec_t"
 msgstr "/Re_editare"
@@ -3913,8 +3913,8 @@ msgstr "Preferinţe"
 msgid "Common preferences"
 msgstr "Preferinţe comune"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Cont"
 
@@ -3947,7 +3947,7 @@ msgstr "salvare mesaj trimis...\n"
 msgid "Find text:"
 msgstr ""
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Distincţie minuscule/majuscule"
@@ -3996,25 +3996,25 @@ msgstr "Ataşamente"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, fuzzy, c-format
 msgid "Can't save the file `%s'."
 msgstr "Directorul `%s' nu a putut fi creat."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Executare"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Imprimare"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4397,7 +4397,7 @@ msgstr ""
 msgid "Command output"
 msgstr "Commandă"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 #, fuzzy
 msgid "Automatically set the following addresses"
 msgstr "Setare automată a adreselor următoare"
@@ -5732,7 +5732,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Marcaj"
@@ -5919,37 +5919,37 @@ msgstr "%s: fişierul nu există\n"
 msgid "Folder properties"
 msgstr "Proprietate"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Selectare fişier"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tip"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 #, fuzzy
 msgid "Normal"
 msgstr "Mod Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr ""
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Răspuns La:"
 
@@ -5958,21 +5958,21 @@ msgstr "Răspuns La:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Setare automată a adreselor următoare"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Director"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Căutarea a eşuat"
@@ -5989,19 +5989,19 @@ msgstr "Ataşamente"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Subiect"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "De la"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Data"
 
@@ -6422,7 +6422,7 @@ msgstr "ştergere newsgroup %s ...\n"
 msgid "Can't retrieve newsgroup list."
 msgstr "Lista de newsgroup-uri nu a putut fi obţinută."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Gata."
 
@@ -6451,7 +6451,7 @@ msgstr "Scanare director %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrare..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Fără Dată)"
 
@@ -6470,393 +6470,397 @@ msgstr "Citare"
 msgid "Folder name:"
 msgstr "Numele fişierului"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 #, fuzzy
 msgid "/Repl_y to"
 msgstr "/Răspunde _la toţi"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 #, fuzzy
 msgid "/Repl_y to/_all"
 msgstr "/Răspunde _la toţi"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 #, fuzzy
 msgid "/Repl_y to/_sender"
 msgstr "/Răspunde _la toţi"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 #, fuzzy
 msgid "/Repl_y to/mailing _list"
 msgstr "/Răspunde _la toţi"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/M_utare..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Copiere..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Marcare"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Marcare/_Marcare"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Marcare/_Demarcare"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Marcare/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 #, fuzzy
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 #, fuzzy
 msgid "/_Mark/Mark all _read"
 msgstr "/_Marcare/Marcare mesaj n_ecitit"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr ""
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 #, fuzzy
 msgid "/Re-_edit"
 msgstr "/Re_editare"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "Adăugare agendă"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Fişier/Act_ualizare directoare"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 #, fuzzy
 msgid "/_View/_Source"
 msgstr "/_Vedere/_La"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 #, fuzzy
 msgid "/_View/All _header"
 msgstr "Toate antetele"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Im_primare..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Creare rezumat...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 msgid "Have color label"
 msgstr ""
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Ataşamente"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Căutare"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Procesare marcaje"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Au mai rămas nişte marcaje. Doriţi să fie procesate ?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Scanare director (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Căutarea a eşuat"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 #, fuzzy
 msgid "No more unread messages"
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 #, fuzzy
 msgid "No unread message found. Search from the end?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 #, fuzzy
 msgid "No unread messages."
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 #, fuzzy
 msgid "No more new messages"
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 #, fuzzy
 msgid "No new message found. Search from the end?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 #, fuzzy
 msgid "No new messages."
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 #, fuzzy
 msgid "No new message found. Go to next folder?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 #, fuzzy
 msgid "No more marked messages"
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 #, fuzzy
 msgid "No marked message found. Search from the end?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 #, fuzzy
 msgid "No marked messages."
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 #, fuzzy
 msgid "No marked message found. Search from the beginning?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 #, fuzzy
 msgid "No more labeled messages"
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 #, fuzzy
 msgid "No labeled message found. Search from the end?"
 msgstr ""
 "Nu au fost găsite mesaje necitite.\n"
 "Doriţi avansarea la directorul următor ?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 #, fuzzy
 msgid "No labeled messages."
 msgstr "Nu există mesaje necitite"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr ""
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Atragere mesaje după subiect..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d şters(e)"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, fuzzy, c-format
 msgid "%s%d moved"
 msgstr "%d mutat(e)"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, fuzzy, c-format
 msgid "%s%d copied"
 msgstr "%d mutat(e)"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " elemente selectate"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d noi, %d necitite, %d în total (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nou(i), %d necitit(e), %d în total"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Sortare rezumat..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tDefinire rezumat din datele din mesaj..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Definire rezumat din datele din mesaj..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Scriere cache rezumat (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Mesajul %d este marcat\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Mesajul %d este marcat ca citit\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Mesajul %d este marcat ca necitit\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Mesajul %s/%d este marcat pentru ştergere\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 #, fuzzy
 msgid "Delete message(s)"
 msgstr "Ştergere mesaj"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 #, fuzzy
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Sunteţi sigur că doriţi să ştergeţi această regulă ?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Ştergere mesaje duplicate..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Mesajul %s/%d este demarcat\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Destinaţia este aceeaşi cu directorul curent."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, fuzzy, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Mesajul %d este marcat pentru mutare în %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Destinaţia este aceeaşi cu directorul curent."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "A avut loc o eroare la procesarea mesajului."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Construire fire de discuţie..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Distrugere fire de discuţie..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtrare..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtrare..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "mesajul %d a fost deja stocat.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Nu."
 
@@ -6930,12 +6934,12 @@ msgstr "/_Mesaj/Recepţion_are poştă pentru toate conturile"
 msgid "_Send queued messages"
 msgstr "Trimiterea mesajului(lor) din lista de aşteptare"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Despre"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Ieşire"
diff --git a/po/ru.po b/po/ru.po
index 5b2562fd..13aa4736 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sylpheed 1.0.0beta4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2004-12-05 17:16+0300\n"
 "Last-Translator: Sergey Vlasov <vsu@altlinux.ru>\n"
 "Language-Team: Russian <ru@li.org>\n"
@@ -20,196 +20,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Чтение настроек учетных записей...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Соединение IMAP4 с %s прервано. Восстановление соединения...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Каталог сервера IMAP4"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "установление соединения IMAP4 с %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Не удалось начать сеанс TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Удаление сообщения %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Копирование сообщения %s%c%d в %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копирование сообщения %s%c%d в %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Получение сообщений с %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не удалось установить флаг удаления: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "не удалось очистить папку от удаленных сообщений\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Получение сообщений с %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не удалось установить флаг удаления: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "невозможно закрыть папку\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "корневая папка %s не существует\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "произошла ошибка при получении LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ошибка при создании '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ошибка при создании '%s' внутри INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не удается создать почтовый ящик: ошибка LIST\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "не удается создать почтовый ящик\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не удается переименовать почтовый ящик %s в %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "не удается удалить почтовый ящик\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "не удалось получить данные конверта\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Отправка сообщения (%d / %d байт)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "ошибка при получении данных конверта.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ошибка при разборе данных конверта: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не удалось соединиться с сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не удалось открыть сеанс связи IMAP4 c %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "не удалось получить пространство имен\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "невозможно выбрать папку: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "Ошибка аутентификации IMAP4.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Ошибка авторизации IMAP4.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не удалось добавить %s к %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(передача файла...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не удалось добавить сообщение к %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не удалось скопировать %s в %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "ошибка при выполнении команды IMAP: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "ошибка при выполнении команды IMAP: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "ошибка при выполнении команды IMAP: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "ошибка преобразования iconv из UTF-7 в %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "ошибка преобразования iconv из %s в UTF-7\n"
@@ -711,7 +711,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Имя"
@@ -967,9 +967,9 @@ msgstr "/Новая папка"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -978,7 +978,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/Правка"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/Удалить"
 
@@ -991,7 +991,7 @@ msgid "Address book"
 msgstr "Адресная книга"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Имя:"
 
@@ -1014,16 +1014,16 @@ msgstr "Добавить"
 msgid "Lookup"
 msgstr "Найти"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Копия:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Скрытно:"
 
@@ -1045,7 +1045,7 @@ msgstr ""
 "Вы хотите удалить папку \"%s\" и все адреса в ней?\n"
 "Если удалить только папку, адреса будут перемещены в родительскую папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Удалить папку"
 
@@ -1255,7 +1255,7 @@ msgstr "Коричневый"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Нет"
 
@@ -1346,7 +1346,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Правка/Перенос по словам при вводе"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/Вид"
 
@@ -1600,7 +1600,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ошибка при получении одного из компонентов сообщения."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Без темы)"
 
@@ -1722,7 +1722,7 @@ msgstr "Тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Размер"
 
@@ -1811,7 +1811,7 @@ msgstr "Свойства"
 msgid "Encoding"
 msgstr "Кодировка"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Путь"
 
@@ -2037,12 +2037,12 @@ msgstr "Изменить имя папки"
 msgid "Input the new name of folder:"
 msgstr "Введите новое имя папки:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Новая папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Введите имя новой папки:"
 
@@ -2211,42 +2211,42 @@ msgstr "Выбор папки"
 msgid "Select folder"
 msgstr "Выбор папки"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Входящие"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Отправленные"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Очередь"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Корзина"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Черновики"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "НоваяПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Символ '%c' не может входить в имя папки."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка '%s' уже существует."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не удалось создать папку '%s'."
@@ -2315,7 +2315,7 @@ msgstr "Новые"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Непрочитанные"
 
@@ -2365,22 +2365,22 @@ msgstr "Проверка новых сообщений во всех папка�
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папка %s выбрана\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Загружаются сообщения из %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Произошла ошибка при загрузке сообщений из '%s'."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2390,26 +2390,26 @@ msgstr ""
 "(если вы хотите создать папку для вложенных папок,\n"
 " добавьте '/' в конец имени)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введите новое имя для '%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Переименовать папку"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2418,12 +2418,12 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Удалить папку"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2434,21 +2434,21 @@ msgstr ""
 "Все вложенные папки и сообщения из '%s' будут удалены.\n"
 "Вы действительно хотите удалить папку?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ошибка при удалении папки '%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Очистка корзины"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Удалить все сообщения из корзины?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2457,34 +2457,34 @@ msgstr ""
 "Удалить почтовый ящик '%s' ?\n"
 "(Сообщения не будут удалены с диска)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Удалить почтовый ящик"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Удалить учетную запись IMAP4 '%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Удалить учетную запись IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Удалить группу новостей '%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Удаление группы новостей"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Удалить учетную запись новостей '%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Удалить учетную запись новостей"
 
@@ -2500,7 +2500,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Создание области просмотра заголовков...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Без отправителя)"
 
@@ -3282,7 +3282,7 @@ msgstr "/Вид/Кодировка/Китайская (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вид/Кодировка/Корейская (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/Вид/Открыть в новом окне"
 
@@ -3566,8 +3566,8 @@ msgstr "Создание главного окна...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Главное окно: проблема с цветом %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "выполнено.\n"
 
@@ -3643,7 +3643,7 @@ msgstr "Sylpheed - Папки"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Сообщение"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Ответить"
 
@@ -3659,15 +3659,15 @@ msgstr "/Ответить отправителю"
 msgid "/Reply to mailing _list"
 msgstr "/Ответить в список рассылки"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Переслать"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Переслать как вложение"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Перенаправить без изменений"
 
@@ -3753,8 +3753,8 @@ msgstr "Свойства"
 msgid "Common preferences"
 msgstr "Общие настройки"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Учетная запись"
 
@@ -3787,7 +3787,7 @@ msgstr "Поиск в текущем сообщении"
 msgid "Find text:"
 msgstr "Искать текст:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Учитывать регистр"
@@ -3832,25 +3832,25 @@ msgstr "Вложения"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ошибка при сохранении файла '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Выполнить команду"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Печать"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4230,7 +4230,7 @@ msgstr "Проверка пароля через POP3 перед отправк�
 msgid "Command output"
 msgstr "Вывод команды"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Автоматически устанавливать адреса"
 
@@ -5532,7 +5532,7 @@ msgstr "Результат команды"
 msgid "Age"
 msgstr "Возраст сообщения"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Метка"
@@ -5698,36 +5698,36 @@ msgstr "Не указано действие."
 msgid "Folder properties"
 msgstr "Свойства папки"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Элемент формата"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Тип"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Обычный"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Не отображать [...] или (...) в начале темы сообщения в списке"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Удалять [...] или (...) в начале темы сообщения при ответе"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Применять к вложенным папкам"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "также использовать при ответе"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Адрес для ответов:"
 
@@ -5736,20 +5736,20 @@ msgstr "Адрес для ответов:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Поиск по любому из полей:"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Поиск по всем полям:"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Поиск не удался"
@@ -5765,19 +5765,19 @@ msgstr "Вложение"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "От"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Дата"
 
@@ -6171,7 +6171,7 @@ msgstr "Не удалось получить список групп новос�
 msgid "Can't retrieve newsgroup list."
 msgstr "Не удалось получить список групп новостей."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Выполнено."
 
@@ -6199,7 +6199,7 @@ msgstr "Просмотр папки %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Фильтрация..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Нет даты)"
 
@@ -6217,353 +6217,357 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Имя файла"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Ответить..."
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Ответить.../Всем"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Ответить.../Отправителю"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Ответить.../В список рассылки"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/Переместить"
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/Копировать"
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/Отметить"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/Отметить/Отметить"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/Отметить/Снять отметку"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/Отметить/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Отметить/Пометить как непрочитанное"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Отметить/Пометить как прочитанное"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/Отметить/Пометить все сообщения как прочитанные"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Выделение цветом"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Изменить"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Добавить отправителя в адресную книгу"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/Инструменты/Создать правило фильтрации"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Инструменты/Создать правило фильтрации/Автоматически"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Инструменты/Создать правило фильтрации/По отправителю"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Инструменты/Создать правило фильтрации/По получателю"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Инструменты/Создать правило фильтрации/По теме"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/Вид/Исходный текст"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/Вид/Все заголовки"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Печать..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Создание области просмотра списка...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Выделение цветом"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Вложение"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Поиск"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Обработка меток"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Несколько меток осталось. Обработать их?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Просмотр папки (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Искать снова"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Нет непрочитанных сообщений"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Непрочитанные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Нет непрочитанных сообщений."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Непрочитанные сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Нет новых сообщений"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Новые сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Нет новых сообщений."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Новые сообщения не найдены. Перейти к следующей папке?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Нет отмеченных сообщений"
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Отмеченные сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Нет выделенных цветом сообщений"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с конца?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Нет выделенных цветом сообщений."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Выделенные цветом сообщения не найдены. Продолжить поиск с начала?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Группировка сообщений по темам..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d удалено"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d перемещено"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопировано"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " сообщений выбрано"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d новых, %d непрочитанных, %d всего (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d новых, %d непрочитанных, %d всего"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Сортировка..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tФормирование списка сообщений..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Формирование списка сообщений..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Запись кеша списка (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Сообщение %d помечено\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Сообщение %d помечено как прочитанное\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Сообщение %d помечено как непрочитанное\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Сообщение %s/%d помечено как удаленное\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Удаление сообщений"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Удалить сообщения без возможности восстановления?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Уничтожение повторяющихся сообщений..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "С сообщения %s/%d сняты пометки\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Сообщение %d помечено для перемещения в %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Место назначения совпадает с текущей папкой."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Сообщение %d помечено для копирования в %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "Место назначения для копирования совпадает с текущей папкой."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Произошла ошибка при обработке сообщений."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Связывание обсуждений..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Отмена связывания обсуждений..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "фильтрация..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Фильтрация..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d сообщений отфильтровано."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Номер"
 
@@ -6640,12 +6644,12 @@ msgstr "/Сообщение/Получить/Получить со всех уч
 msgid "_Send queued messages"
 msgstr "Послать сообщения из очереди"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "О программе"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Выход"
diff --git a/po/sk.po b/po/sk.po
index 5f1215e8..bf2e8094 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -20,196 +20,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Načítavam nastavenia pre všetky kontá...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 spojenie k %s sa prerušilo. Znovu pripájam...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Priečinok serveru IMAP"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "vytváram IMAP4 spojenie k %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Nedá sa vytvoriť TLS spojenie.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Odstraňujem správu %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopírujem správu %s%c%d do %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "nedá sa nastaviť príznak zmazania: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "nedá sa odstrániť\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Prijímam správy z %s..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "nedá sa nastaviť príznak zmazania: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "priečinok sa nedá zatvoriť\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "koreňový priečinok %s neexistuje\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "pri príkaze LIST sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Nedá sa vytvoriť '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Nedá sa vytvoriť '%s' v INBOXe\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "nedá sa vytvoriť schránka: príkaz LIST zlyhal\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "nedá sa vytvoriť schránka\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "nedá sa premenovať schránka: %s na %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "schránka sa nedá odstrániť \n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "obálka sa nedá načítať\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Odosielam správu (%d / %d bajtov)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "pri získavaní obálky sa vyskytla chyba.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "obálka sa nedá prečítať: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Nedá sa pripojiť k serveru IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Nedá sa vytvoriť IMAP4 spojenie s: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "nedá sa nájsť obálka\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "priečinok sa nedá vytvoriť: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 autentizácia bola neúspešná.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "neúspešné prihlásenie k IMAP4.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "nedá sa napojiť %s k %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(posielam súbor...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "nedá sa napojiť správa k %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "nedá sa kopírovať %s do %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "chyba pri IMAP príkaze: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "chyba pri IMAP príkaze: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "chyba pri IMAP príkaze: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv nemôže skonvertovať UTF-7 na %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv nemôže skonvertovať %s na UTF-7\n"
@@ -709,7 +709,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Meno"
@@ -965,9 +965,9 @@ msgstr "/Nový _Priečinok"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -976,7 +976,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Upraviť"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/Z_mazať"
 
@@ -989,7 +989,7 @@ msgid "Address book"
 msgstr "Otvoriť adresár"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Meno:"
 
@@ -1012,16 +1012,16 @@ msgstr "Pridať"
 msgid "Lookup"
 msgstr "Vyhľadať"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Komu:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kópia:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Slepá kópia:"
 
@@ -1043,7 +1043,7 @@ msgstr ""
 "Naozaj chcete zmazať priečinok A SÚČASNE všetky adresy v %s ?\n"
 "Ak zmažete len priečinok, adresy z neho sa presunú do nadradeného priečinku."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Odstrániť priečinok"
 
@@ -1254,7 +1254,7 @@ msgstr "Hnedá"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Žiadna"
 
@@ -1350,7 +1350,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Úp_ravy/_Kopírovať"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Zobraziť"
 
@@ -1607,7 +1607,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Nedá sa získať časť viacdielnej správy."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(bez predmetu)"
 
@@ -1729,7 +1729,7 @@ msgstr "MIME typ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Veľkosť"
 
@@ -1818,7 +1818,7 @@ msgstr "Vlastnosti"
 msgid "Encoding"
 msgstr "Kódová stránka"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Cesta"
 
@@ -2045,12 +2045,12 @@ msgstr "Upraviť priečinok"
 msgid "Input the new name of folder:"
 msgstr "Zadajte nový názov priečinka:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nový priečinok"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Zadajte názov nového priečinka:"
 
@@ -2219,42 +2219,42 @@ msgstr "Spoolovací priečinok"
 msgid "Select folder"
 msgstr "Zvoľte priečinok"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prijaté"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Odoslané"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Na odoslanie"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Odpadkový kôš"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Koncepty"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "Nový Priečinok"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Názov priečinka nemôže obsahovať `%c'."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Priečinok `%s' už existuje."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Nedá sa vytvoriť priečinok `%s'."
@@ -2325,7 +2325,7 @@ msgstr "Nový"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Neprečítané"
 
@@ -2375,22 +2375,22 @@ msgstr "Kontrolujem nové spráby vo všetkých priečinkoch..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Priečinok %s je zvolený\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Odosielam správu..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, fuzzy, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Pri odosielaní správy na %s nastala chyba."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2400,26 +2400,26 @@ msgstr ""
 "(Ak chcete vytvoriť priečinok s ďalšími podzložkami,\n"
 "pridajte na koniec názvu '/')"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Zadajte nový názov pre `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Premenovať priečinok"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2428,12 +2428,12 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Odstrániť priečinok"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2444,21 +2444,21 @@ msgstr ""
 "Všetky priečinky a správy v `%s' budú odstránené.\n"
 "Naozaj pokračovať?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Priečinok '%s' sa nedá odstrániť."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Vyprázdniť kôš"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Zmazať všetky správy v koši?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2467,34 +2467,34 @@ msgstr ""
 "Naozaj chcete odstrániť schránku '%s' ?\n"
 "(Správy NEBUDÚ odstránené z disku)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Odstrániť schránku"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Naozaj chcete odstrániť IMAP4 konto '%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Odstrániť IMAP4 konto"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Naozaj chcete odstrániť diskusnú skupinu '%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Odstrániť diskusnú skupinu"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Naozaj chcede odstrániť news konto '%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Odstrániť news konto"
 
@@ -2510,7 +2510,7 @@ msgstr "Predmet:"
 msgid "Creating header view...\n"
 msgstr "Vytváram náhľad hlavičky...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(nie je známy odosielateľ)"
 
@@ -3303,7 +3303,7 @@ msgstr "/_Zobraziť/_Kódovanie/Čínština (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Zobraziť/_Kódovanie/Kórea (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Zobraziť/Otvoriť v _novom okne"
 
@@ -3589,8 +3589,8 @@ msgstr "Vytváram hlavné okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Hlavné Okno: alokácia farieb %d bola neúspešná\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "hotovo.\n"
 
@@ -3667,7 +3667,7 @@ msgstr "Sylpheed - Zobrazenie priečinku"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Zobrazenie správy"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Odpovedať"
 
@@ -3686,15 +3686,15 @@ msgstr "/O_dpovedať komu/_odosielateľovi"
 msgid "/Reply to mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Poslať ďalej"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Poslať ďalej ako p_rílohu"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Pr_esmerovať"
 
@@ -3780,8 +3780,8 @@ msgstr "Nastavenia"
 msgid "Common preferences"
 msgstr "Všeobecné nastavenia"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -3813,7 +3813,7 @@ msgstr "Nájdi v súčasnej správe"
 msgid "Find text:"
 msgstr "Nájdi text:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Záleží na veľkosti písmen"
@@ -3858,25 +3858,25 @@ msgstr "Prílohy"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Nemôžem uložiť súbor '%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Vykonať"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Tlačiť"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4257,7 +4257,7 @@ msgstr "Autentizovať cez POP3 pred odosielaním"
 msgid "Command output"
 msgstr "Výstup príkazu"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
@@ -5563,7 +5563,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Značka"
@@ -5749,36 +5749,36 @@ msgstr "%s: súbor neexistuje\n"
 msgid "Folder properties"
 msgstr "Vlastnosti priečinka"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Symbol"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Typ"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Obyčajný"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Nezobrazovať [...] alebo (...) na začiatku názvu v zozname správ"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Zmazať [...] alebo (...) na začiatku názvu v zozname správ"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Platí aj pre podpriečinky"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "použiť aj pri odpovedaní"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Odpovedať komu:"
 
@@ -5787,21 +5787,21 @@ msgstr "Odpovedať komu:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automaticky nastaviť nasledujúce adresy"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Priečinok"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Hľadanie sa nepodarilo"
@@ -5817,19 +5817,19 @@ msgstr "Príloha"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Predmet"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Dátum"
 
@@ -6223,7 +6223,7 @@ msgstr "Nedá sa získať zoznam diskusných skupín."
 msgid "Can't retrieve newsgroup list."
 msgstr "Nedá sa získať zoznam diskusných skupín."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Hotovo."
 
@@ -6251,7 +6251,7 @@ msgstr "Prehľadávam priečinok %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(bez dátumu)"
 
@@ -6269,350 +6269,354 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Názov súboru"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/O_dpovedať komu"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/O_dpovedať komu/_všetkým"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/O_dpovedať komu/_odosielateľovi"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dpovedať komu/do _diskusnej skupiny"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/Pre_sunúť"
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopírovať..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/Oz_načiť"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/Oz_načiť/Oz_načiť"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/Oz_načiť/_Odznačiť"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/Oz_načiť/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Oz_načiť/Označiť ako n_eprečítané"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Oz_načiť/Označiť ako _prečítané"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/Oz_načiť/Označiť _všetky ako prečítané"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/_Farebné označenie"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Znovu upraviť"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Pridať odosielateľa do _adresára"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Vytvor_iť pravidlo filtra"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Vytvor_iť pravidlo filtra/_Automaticky"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _odosielateľa"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Vytvor_iť pravidlo filtra/podľa _príjemcu"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Vytvor_iť pravidlo filtra/podľa p_redmetu"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Zobraziť/_Zdroj"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Zobraziť/Všetky _hlavičky"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Tlačiť..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Vytváram zoznam správy...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Farebné označenie"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Príloha"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Hľadať"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Spracovať značky"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Ostali nejaké značky. Spracovať?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Prehľadávam priečinok (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Hľadať znova"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Žiadne neprečítané správy"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Neboli nájdené žiadne neprečítané správy. Hľadať od konca?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Žiadne neprečítané správy."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Neboli nájdené žiadne neprečítané správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Žiadne nové správy"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Neboli nájdené žiadne nové správy. Hľadať od konca?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Žiadne nové správy."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Neboli nájdené žiadne nové správy. Prejsť do ďalšieho priečinku?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Žiadne označené správy"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Žiadne označené správy."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadné označené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Žiadne zafarbené správy"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od konca?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Žiadne zafarbené správy."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Neboli nájdené žiadne zafarbené správy. Hľadať od začiatku?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Zoskupujem správu podľa názvu..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d zmazaných"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d presunutých"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d skopírovaných"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " položiek zvolených"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novýcvh, %d neprečítaných, %d celkovo"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Triedim zoznam správ..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tVytváram zoznam správ..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Vytváram zoznam správ..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Zapisujem stav zoznamu do medzipamäte (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Správa %d je označená\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Správa %d je označená ako čítaná\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Správa %d je označená ako neprečítaná\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Správa %s/%d je určená na zmazanie\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Zmazať správy"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Naozaj chcete zmazať správy z koša?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Mažem duplikátne správy..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Správa %s/%d je odznačená\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Správa %d je určená k presunutiu do %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Cieľ je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Správa %d je určená ku kopírovaniu do %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cieľ kopírovania je zhodný s aktuálnym priečinkom."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Pri spracovávaní pošty sa vyskytla chyba."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Vytváram vlákna..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Odstraňujem štruktúru vlákien..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtrujem..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtrujem..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr ""
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Č."
 
@@ -6686,12 +6690,12 @@ msgstr "/Sp_ráva/_Prijať/Zo _všetkých kônt"
 msgid "_Send queued messages"
 msgstr "Odoslať správy vo fronte"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "O programe"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Ukončiť"
diff --git a/po/sl.po b/po/sl.po
index 55291ae3..f07994d9 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -18,201 +18,201 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Berem vse nastavitve za vsak račun...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Povezava IMAP4 do %s%d se je prekinila. Povezujem se znova...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Imenik strežnika IMAP"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "delam povezavo IMAP4 do %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Ne morem pričeti seje TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Brišem sporočilo %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Prestavljam sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram sporočilo %s%c%d v %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "ne morem izbrisati\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Sprejemam sporočila iz %s v %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne morem nastaviti izbrisanih zastavic: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Datoteka z oznakami ni bila najdena.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "med dobivanjem LIST je prišlo do napake.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Ne morem narediti '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Ne morem narediti '%s' pod mapo Prejeto\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne morem narediti poštnega predala: LIST ni uspel\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "ne morem narediti poštnega predala\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne morem preimenovati poštnega predala: %s v %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "ne morem izbrisati poštnega predala\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "ne morem dobiti ovojnice\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Pošiljam sporočilo (%d / %d zlogov)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "med dobivanjem ovojnice je prišlo do napake.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne morem razčleniti ovojnice: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne morem se povezati s strežnikom IMAP4: %s%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne morem vzpostaviti seje IMAP4 z: %s%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "ne morem dobiti imenskega prostora\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne morem izbrati mape: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Overovitvena metoda"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Prijava na IMAP4 ni uspela.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne morem pripeti %s na %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(pošiljam datoteko...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne morem dodati sporočila %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne morem kopirati %d na %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "napaka med IMAPovim ukazom: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "napaka med IMAPovim ukazom: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne more pretvoriti UTF-7 v %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne more pretvoriti %s v UTF-7\n"
@@ -717,7 +717,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
@@ -971,9 +971,9 @@ msgstr "/Nova _mapa"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -982,7 +982,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Urejanje"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Brisanje"
 
@@ -995,7 +995,7 @@ msgid "Address book"
 msgstr "Imenik naslovov"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Ime:"
 
@@ -1018,16 +1018,16 @@ msgstr "Dodajanje"
 msgid "Lookup"
 msgstr "Poišči"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kp:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Skp:"
 
@@ -1049,7 +1049,7 @@ msgstr ""
 "Ali res želite izbrisati mapo IN vse naslove v '%s' ? \n"
 "Če izbrišete samo mapo, se bodo vsi naslovi prestavili v starševsko mapo."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Izbriši mapo"
 
@@ -1259,7 +1259,7 @@ msgstr "Rjava"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Nič"
 
@@ -1356,7 +1356,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Uredi/_Kopiraj"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Pogled"
 
@@ -1613,7 +1613,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne morem dobiti dela večdelnega sporočila."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Brez zadeve)"
 
@@ -1734,7 +1734,7 @@ msgstr "Tip MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Velikost"
 
@@ -1824,7 +1824,7 @@ msgstr "Lastnost"
 msgid "Encoding"
 msgstr "Nabor znakov"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Pot"
 
@@ -2050,12 +2050,12 @@ msgstr "Urejanje mape"
 msgid "Input the new name of folder:"
 msgstr "Vnesite novo ime mape:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Nova mapa"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Vnesite ime nove mape:"
 
@@ -2223,42 +2223,42 @@ msgstr "Imenik spool"
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Prejeto"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslano"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Čakajoče"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeti"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Osnutki"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "Nova mapa"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "Znaka '%c' ne more biti v imenu mape."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mapa '%s' že obstaja."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne morem narediti mape '%s'."
@@ -2329,7 +2329,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Neprebrano"
 
@@ -2380,22 +2380,22 @@ msgstr "Preverjam nova sporočila v vseh mapah..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mapa %s je izbrana\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Pošiljam sporočilo"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, 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:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2405,26 +2405,26 @@ msgstr ""
 "(če želite narediti mapo za shranjevanje podmap,\n"
 "dodajte '/' na koncu imena datoteke)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Vnesite novo ime za '%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Preimenuj mapo"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2433,12 +2433,12 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Izbriši mapo"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2449,21 +2449,21 @@ msgstr ""
 "Vse mape in sporočila pod '%s' bodo izbrisana.\n"
 "Ali jih res želite izbrisati?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne morem odstraniti mape '%s'"
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Izprazni smetnjak"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Izbrišem vsa sporočila v smetnjaku?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2472,34 +2472,34 @@ msgstr ""
 "Ali naj res odstranim poštni predal '%s' ?\n"
 "(Sporočila se NE bodo izbrisala z diska)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Odstrani poštni predal"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Ali naj res izbrišem račun IMAP4 '%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Izbriši račun IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Ali naj res izbrišem novičarsko skupino '%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Izbriši novičarsko skupino"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Ali naj res izbrišem novičarski račun '%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Izbriši novičarski račun"
 
@@ -2515,7 +2515,7 @@ msgstr "Zadeva:"
 msgid "Creating header view...\n"
 msgstr "Delam gledanje zaglavja...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Brez pošiljatelja)"
 
@@ -3302,7 +3302,7 @@ msgstr "/_Pogled/Nabor zna_kov/Kitajski (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pogled/Kodni nabor/Korejski (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Poglej/Odpri v _novem oknu"
 
@@ -3594,8 +3594,8 @@ msgstr "Ustvarjam glavno okno...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "GlavnoOkno: alokacija barve %d ni uspela\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "opravljeno.\n"
 
@@ -3671,7 +3671,7 @@ msgstr "Syčpheed - ogled mape"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - ogled sporočila"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/O_dgovori"
 
@@ -3690,15 +3690,15 @@ msgstr "/Odgovor _za/_pošiljatelja"
 msgid "/Reply to mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/P_osreduj"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Posreduj kot prilo_go"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
@@ -3784,8 +3784,8 @@ msgstr "Nastavitve"
 msgid "Common preferences"
 msgstr "Splošne preference"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Račun"
 
@@ -3817,7 +3817,7 @@ msgstr "Poišči v trenutnem sporočilu"
 msgid "Find text:"
 msgstr "Poišči besedilo:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Razlikuj velike in male črke"
@@ -3862,25 +3862,25 @@ msgstr "Priloge"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne morem odstraniti datoteke `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvedi"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Tiskanje"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4261,7 +4261,7 @@ msgstr "Pred pošiljanjem avtenticiraj s POP3"
 msgid "Command output"
 msgstr "Ukaz"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Samodejno nastavi sledeče naslove"
 
@@ -5565,7 +5565,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Označi"
@@ -5752,36 +5752,36 @@ msgstr "%s: datoteka ne obstaja\n"
 msgid "Folder properties"
 msgstr "Lastnost mape"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Določevalec"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tip"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Udejani na podmapah"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "uporabi tudi ob odgovoru"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Odgovor za:"
 
@@ -5790,21 +5790,21 @@ msgstr "Odgovor za:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Samodejno nastavi sledeče naslove"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Mapa"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Iskanje neuspešno"
@@ -5820,19 +5820,19 @@ msgstr "Priloga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Zadeva"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Datum"
 
@@ -6224,7 +6224,7 @@ msgstr "Ne morem potegniti seznama novičarskih skupin."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne morem potegniti seznama novičarskih skupin."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Opravljeno."
 
@@ -6252,7 +6252,7 @@ msgstr "Preiskujem mapo %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Brez datuma)"
 
@@ -6270,351 +6270,355 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Odgovor _za"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Odgovor _za/_vse"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Odgovor _za/_pošiljatelja"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Odgovor _za/_dopisni seznam"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/Pre_stavi..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/Prepiš_i..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Oznaka"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Oznaka/_Označi"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Oznaka/O_dznači"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Oznaka/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Oznaka/Označi kot _neprebrano"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Oznaka/Označi kot _prebrano"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Oznaka/Označi _vsa kot prebrana"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Barvanje oz_nak"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/_Znova uredi"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Doda_j pošiljatelja v adresar"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Ustvari pravilo za f_iltriranje"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Ustvari pravilo za f_iltriranje/S_amodejno"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Ustvari pravilo za f_iltriranje/po p_ošiljatelju"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Ustvari pravilo za f_iltriranje/po _naslovniku"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Ustvari pravilo za f_iltriranje/po _zadevi"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Pogled/_Izvirnik"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Pogled/Vsa _zaglavja"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Natisni..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Delam ogled povzetka...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Barvanje oz_nak"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Priloga"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Iskanje"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Oznaka procesa"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Nekaj oznak je ostalo. Naj obdelam?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Preiskujem mapo (%s) ..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Ponovno iskanje"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Nobeno neprebrano sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Ni neprebranih sporočil."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr ""
 "Nobeno neprebrano sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Ni več neprebranih sporočil"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Ni novih sporočil."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Nobeno novo sporočilo ni bilo najdeno. Naj grem v naslednjo mapo?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Ni več označenih sporočil"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Ni označenih sporočil."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nobeno označeno sporočilo ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Ni več sporočil z oznako"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem s konca?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Ni sporočil z oznako"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nobeno sporočilo z oznako ni bilo najdeno. Naj iščem od začetka?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Privlačim sporočila po zadevi..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d izbrisanih"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d prestavljenih"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d presnetih"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " izbranih kosov"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d neprebranih, skupaj %d (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d neprebranih, skupaj %d"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Razvrščam povzetka..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tNastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Nastavljam povzetek iz podatkov sporočila..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišem povzetek predpomnilnika (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Sporočilo %d je označeno\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Sporočilo %d je označeno, kot da se bere\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Sporočilo %d je označeno kot neprebrano\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Sporočilo %s/%d je nastavljeno za brisanje\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Izbriši sporočilo/a"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Ali res želite izbrisati sporočila iz smetnjaka?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Brišem podvojena sporočila..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Sporočilo %s/%d je odoznačeno\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prestavitev v %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Cilj je enak trenutni mapi."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Sporočilo %d je nastavljeno za prepis v %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "Cilj prepisa je enak trenutni mapi"
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Med obdelavo pošte je prišlo do napake."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Gradim niti..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Raznitujem..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtriram..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtriram..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "sporočilo %d je že v predpomnilniku.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Ne."
 
@@ -6689,12 +6693,12 @@ msgstr "_Sporočilo/Poberi z vseh _računov"
 msgid "_Send queued messages"
 msgstr "Pošlji čakajoča sporočila"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "O"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Končaj"
diff --git a/po/sr.po b/po/sr.po
index 50d94577..188b6101 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2002-11-29 21:08+0100\n"
 "Last-Translator: garret <garret@garrets.tk>\n"
 "Language-Team: Serbian\n"
@@ -19,201 +19,201 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Čitanje konfiguracije za svaki nalog...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, fuzzy, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4 veza prema %s:%d je pukla. Povezujem se ponovo...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Direktorijum IMAP servera"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "ostvarujem IMAP4 vezu prema %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Ne mogu pokrenuti TLS sesiju.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "Brišem poruke %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Pomeram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopiram poruke %s%c%d u %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, fuzzy, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "ne mogu postaviti obrisane oznake: %d\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "ne mogu obrisati\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "Primam poruke sa %s u %s...\n"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 #, fuzzy
 msgid "can't set deleted flags: 1:*\n"
 msgstr "ne mogu postaviti obrisane oznake: 1:%d\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 #, fuzzy
 msgid "can't close folder\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, fuzzy, c-format
 msgid "root folder %s not exist\n"
 msgstr "Označena datoteka ne postoji.\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 #, fuzzy
 msgid "error occurred while getting LIST.\n"
 msgstr "došlo je do greške prilikom dohvatanja LISTe.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "ne mogu kreirati '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "ne mogu kreirati '%s' ispod INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "ne mogu kreirati sanduče: LIST nije uspeo\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "ne mogu kreirati sanduče\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "ne mogu promeniti ime sandučeta %s u %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "ne mogu obrisati sanduče\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "ne mogu dobiti omot\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Šaljem poruku (%d / %d bajtova)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "došlo je do greške prilikom dobijanja omota.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "ne mogu analizirati omot: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Ne mogu se povezati sa IMAP4 serverom: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Ne mogu se povezati s IMAP4 serverom: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "ne mogu dobiti namespace\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "ne mogu odabrati direktorijum: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 #, fuzzy
 msgid "IMAP4 authentication failed.\n"
 msgstr "Način provere identieta"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 login nije uspeo.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "ne mogu dodati %s na %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(šaljem datoteku...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, fuzzy, c-format
 msgid "can't append message to %s\n"
 msgstr "ne mogu dodati poruku %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, fuzzy, c-format
 msgid "can't copy %s to %s\n"
 msgstr "ne mogu kopirati %d u %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, fuzzy, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "grečka prilikom imap naredbe: STORE %d:%d %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 #, fuzzy
 msgid "error while imap command: CLOSE\n"
 msgstr "greška prilikom imap naredbe: EXPUNGE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv ne može prebaciti UTF-7 to %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv ne može prebaciti %s to UTF-7\n"
@@ -717,7 +717,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Ime"
@@ -971,9 +971,9 @@ msgstr "/Novi _direktorijum"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -982,7 +982,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Izmeni"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Obriši"
 
@@ -995,7 +995,7 @@ msgid "Address book"
 msgstr "Adresar"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Ime:"
 
@@ -1018,16 +1018,16 @@ msgstr "Dodaj"
 msgid "Lookup"
 msgstr "Potraži"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Za:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1050,7 +1050,7 @@ msgstr ""
 "Ako brišete samo direktorijum, adrese će biti premeštene u prethodni "
 "direktorijum."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Obriši direktorijum"
 
@@ -1253,7 +1253,7 @@ msgstr "Smeđa"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Ništa"
 
@@ -1350,7 +1350,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Izmeni/_Kopiraj"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Pregled"
 
@@ -1607,7 +1607,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Ne mogu dobiti deo poruke iz više delova."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Bez teme)"
 
@@ -1729,7 +1729,7 @@ msgstr "MIME tip"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Veličina"
 
@@ -1819,7 +1819,7 @@ msgstr "Svojstva"
 msgid "Encoding"
 msgstr "Kodiranje"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Putanja"
 
@@ -2045,12 +2045,12 @@ msgstr "Izmeni direktorijum"
 msgid "Input the new name of folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Novi direktorijum"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Unesite ime novog direktorijuma:"
 
@@ -2218,42 +2218,42 @@ msgstr "Spool direktorijum"
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Sanduče"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Poslato"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Odloženo"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Smeće"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nedovršeno"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NoviDir"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' ne može biti uvršten u ime direktorijuma."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Direktorijum `%s' već postoji."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Ne mogu napraviti direktorijum `%s'."
@@ -2324,7 +2324,7 @@ msgstr "Novo"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Nepročitano"
 
@@ -2375,22 +2375,22 @@ msgstr "Proveravanje novih poruka u svim direktorijumima..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Direktorijum %s je odabran\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, fuzzy, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Šaljem poruku"
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, 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:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2400,26 +2400,26 @@ msgstr ""
 "(ukoliko želite napraviti direktorijum za smeštanje poddirektorijuma,\n"
 "dodajte `/' na kraj imena)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Unesite novo ime za `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Preimenuj direktorijum"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2428,12 +2428,12 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Obriši direktorijum"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2444,21 +2444,21 @@ msgstr ""
 "Svi direktorijum(i) i poruka/e pod `%s' biće obrisane.\n"
 "Želite li ih zaista obrisati?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Ne mogu da premestim direktorijum `%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Isprazni smeće"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Isprazniti sve poruke iz smeća?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2467,34 +2467,34 @@ msgstr ""
 "Zista premestiti direktorijum `%s' ?\n"
 "(Poruke NEĆE biti obrisane sa diska)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "/_Ukloni sanduče"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Zaista obrisati `%s' IMAP4 nalog?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Obriši IMAP4 nalog"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Zaista obrisati `%s' news grupu?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Obriši news grupu"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Zaista obrisati `%s' news nalog?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Obriši news nalog"
 
@@ -2510,7 +2510,7 @@ msgstr "Tema:"
 msgid "Creating header view...\n"
 msgstr "Stvaram pregled zaglavlja...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Bez pošiljaoca)"
 
@@ -3298,7 +3298,7 @@ msgstr "/_Pregled/_Znakovni standard/Kina (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Pregled/_Znakovni standard/Koreja (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Pregled/Otvori u novom _prozoru"
 
@@ -3590,8 +3590,8 @@ msgstr "Kreiranje glavnih prozora...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Glavni Prozor: prikaz boje %d nije uspeo\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "gotovo.\n"
 
@@ -3667,7 +3667,7 @@ msgstr "Sylpheed - Direktorijumi"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Poruke"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Od_govor"
 
@@ -3686,15 +3686,15 @@ msgstr "/O_dgovori/_pošiljaocu"
 msgid "/Reply to mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/P_rosledi"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Pro_sledi kao dodatak"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Pre_usmeri"
 
@@ -3780,8 +3780,8 @@ msgstr "Svojstva"
 msgid "Common preferences"
 msgstr "Uobičajena svojstva"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Nalog"
 
@@ -3813,7 +3813,7 @@ msgstr "Pronađi u trenutnoj poruci"
 msgid "Find text:"
 msgstr "Pronađi tekst:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Osjetljiv na velika/mala slova"
@@ -3858,25 +3858,25 @@ msgstr "Dodatak"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Ne mogu sačuvati datoteku `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Izvrši"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Štampaj"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4257,7 +4257,7 @@ msgstr "Proveri identitet sa POP3 pre slanja"
 msgid "Command output"
 msgstr "Naredba"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Automatski postavi sledeće adrese"
 
@@ -5560,7 +5560,7 @@ msgstr ""
 msgid "Age"
 msgstr ""
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Oznaka"
@@ -5747,36 +5747,36 @@ msgstr "%s: datoteka ne postoji\n"
 msgid "Folder properties"
 msgstr "Osobine direktorijuma"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Specifier"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tip"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normalno"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr ""
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr ""
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Primeni na poddirektorijume"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "koristi i prilikom odovora"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Odvovori-Na:"
 
@@ -5785,21 +5785,21 @@ msgstr "Odvovori-Na:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr ""
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 #, fuzzy
 msgid "Match all of the following"
 msgstr "Automatski postavi sledeće adrese"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Direktorijum"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Traži direktorijum"
@@ -5815,19 +5815,19 @@ msgstr "Dodatak"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Tema"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Od"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Datum"
 
@@ -6222,7 +6222,7 @@ msgstr "Ne mogu pronaći listu news grupa."
 msgid "Can't retrieve newsgroup list."
 msgstr "Ne mogu pronaći listu news grupa."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Gotovo."
 
@@ -6250,7 +6250,7 @@ msgstr "Pretražujem direktorijum %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Nema Datuma)"
 
@@ -6269,350 +6269,354 @@ msgstr "Citat"
 msgid "Folder name:"
 msgstr "Ime datoteke"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/O_dgovori"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/O_dgovori/svim_a"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/O_dgovori/_pošiljaocu"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/O_dgovori/na mailing _listu"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Premeštanje..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopiranje..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Označi"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Označi/_Označi"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/_Označi/_Ukloni oznaku"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Označi/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Označi/Označi kao _nepročitano"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Označi/Označi kao _pročitano"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Označi/Označi sve _pročitano"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Ponovi i_zmeni"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Dod_aj pošiljaoca u adresar"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Napravi pravilo za f_iter"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Napravi pravilo za f_iter/_Automatski"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Napravi pravilo za f_iter/Po _Od"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Napravi pravilo za f_iter/Po _Za"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/Napravi pravilo za f_iter/Po _Temi"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Pregled/Pr_egledaj izvor"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Pregled/Prikaži s_vo zaglavlje"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Štampanje..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Stvaranje pregleda održavanja...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Oznaka _boje"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Dodatak"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Pretraga"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Izvrši oznaku"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Neke oznake su izostavljene. Izvršiti ih?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Pregledanje direktorijuma (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Pretraži ponovo"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Nema nepročitanih poruka"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Nema više nepročitanih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Nema nepročitanih poruka."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Nema više nepročitanih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Nema više novih poruka"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Nema više novih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Nema novih poruka."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Nema više novih poruka. Preći u sledeći direktorijum?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Nema više označenih poruka"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Nema više označenih poruka. Nastaviti od kraja?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Nema označenih poruka."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Nema označenih poruka. Tražiti od početka?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Nema više obeleženih poruka"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Nema više obeleženih poruka. Tražiti od kraja?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Nema obeleženih poruka."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Nema više obeleženih poruka. Krenuti od početka?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Prihvatanje poruka po temi..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d obrisano"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d premešteno"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopirano"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " jedinica odabrano"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d novih, %d nepročitanih, %d ukupno (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d novih, %d nepročitanih, %d ukupno"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Slažem pregled..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tPostavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Postavljanje pregleda od podataka poruke..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Pišenje pohranu pregleda (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Poruka %d je označena\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Poruka %d je označena kao pročitana\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Poruka %d je označena kao nepročitana\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Poruka %s/%d označena je za brisanje\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Obriši poruku/e"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Želite li zaista obrisati poruku/e iz smeća?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Brianje duplih poruka..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Poruka %s/%d je neoznačena\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Poruka %d je označena za premeštanje u %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Odredište je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Poruka %d je označena za kopiranje u %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 #, fuzzy
 msgid "Destination for copy is same as current folder."
 msgstr "ODredište za kopiranje je isto kao i trenutni direktorijum."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 #, fuzzy
 msgid "Error occurred while processing messages."
 msgstr "Došlo je do greške pri radu s poštom."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Izgrađivanje stabla..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Rasipanje..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtriranje..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtriranje..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, fuzzy, c-format
 msgid "%d message(s) have been filtered."
 msgstr "poruka %d već je prihvaćena.\n"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Ne."
 
@@ -6687,12 +6691,12 @@ msgstr "/_Poruka/Prove_ri sa svih naloga"
 msgid "_Send queued messages"
 msgstr "Šalje odložene poruku/e"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "O"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Izlaz"
diff --git a/po/sv.po b/po/sv.po
index c477287d..b92d800f 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -19,194 +19,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Läser all konfiguration för varje konto...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "IMAP4-förbindelse till %s har avbrutits. Återuppkopplar...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP-server stänger av LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "skapar IMAP4-förbindelse till %s:%d...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Kan inte starta TLS-session.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "Hämtar meddelande %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Lägger till meddelande till %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Flyttar meddelande %s till %s..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Kopierar meddelanden %s till %s..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "Tar bort meddelanden %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "kan inte sätta borttaget-flaggor: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "kan inte utplåna\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Tar bort alla meddelanden i %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "kan inte sätta borttaget-flaggor: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "kan inte stänga mapp\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "rotmapp %s finns inte\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "fel uppstod vid hämtning av LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Kan inte skapa \"%s\"\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "kan inte skapa \"%s\" under INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "kan inte skapa brevlåda: LIST misslyckades\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "kan inte skapa brevlåda\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "kan inte byta namn på brevlåda %s till %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "kan inte ta bort brevlåda\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "kan inte hämta kuvert\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Hämtar meddelandehuvuden (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "fel uppstod vid hämtning av kuvert.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "kan inte tolka kuvert: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Kan inte ansluta till IMAP4-server: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Kan inte skapa IMAP4-session med: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "kan inte hämta namnutrymme\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "kan inte välja mapp: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "fel vid imapkommando: STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4-autentisering misslyckades.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4-inloggning misslyckades.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "kan inte lägga till %s till %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(skickar fil...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "kan inte lägga till meddelande till %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "kan inte kopiera %s till %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "fel vid imapkommando: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "fel vid imapkommando: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "fel vid imapkommando: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv kan inte konvertera UTF-7 till %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv kan inte konvertera %s till UTF-7\n"
@@ -714,7 +714,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Namn"
@@ -968,9 +968,9 @@ msgstr "/Ny _mapp"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -979,7 +979,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Redigera"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Ta bort"
 
@@ -992,7 +992,7 @@ msgid "Address book"
 msgstr "Adressbok"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Namn:"
 
@@ -1015,16 +1015,16 @@ msgstr "Lägg till"
 msgid "Lookup"
 msgstr "Slå upp"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Till:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Kopia:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Dold kopia:"
 
@@ -1047,7 +1047,7 @@ msgstr ""
 "Tar du bara bort mappen, kommer adresserna att flyttas\n"
 "en mapp uppåt i hierarkin."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Ta bort mapp"
 
@@ -1250,7 +1250,7 @@ msgstr "Brun"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Ingen"
 
@@ -1341,7 +1341,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Redigera/Automatisk _radbrytning"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Visa"
 
@@ -1571,7 +1571,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Kan inte läsa delen av multipart-meddelandet."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Inget Ämne)"
 
@@ -1694,7 +1694,7 @@ msgstr "MIME-typ"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Storlek"
 
@@ -1783,7 +1783,7 @@ msgstr "Egenskaper"
 msgid "Encoding"
 msgstr "Kodning"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Sökväg"
 
@@ -2004,12 +2004,12 @@ msgstr "Redigera mapp"
 msgid "Input the new name of folder:"
 msgstr "Skriv in det nya namnet på mappen:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Ny mapp"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Skriv in namnet på den nya mappen:"
 
@@ -2176,42 +2176,42 @@ msgstr "Välj katalog"
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Inkorg"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Skickat"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kö"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Utkast"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "NyMapp"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "\"%c\" får inte finnas i mappnamn."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Mappen \"%s\" finns redan."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Kan inte skapa mappen \"%s\"."
@@ -2279,7 +2279,7 @@ msgstr "Nya"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Olästa"
 
@@ -2329,22 +2329,22 @@ msgstr "Letar efter nya meddelanden i alla mappar..."
 msgid "Junk"
 msgstr "Skräp"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Mappen %s är vald\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Laddar ner meddelanden i %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Ett fel uppstod vid nedladdning av meddelanden i \"%s\"."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2354,26 +2354,26 @@ msgstr ""
 "(om du vill skapa en mapp som skall innehålla undermappar,\n"
 " lägg till \"/\" vid slutet av namnet)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Skriv in nytt namn på \"%s\":"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Byt namn på mapp"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Kan inte flytta mappen \"%s\"."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2382,12 +2382,12 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Ta bort mapp"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2400,20 +2400,20 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dem?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Kan inte ta bort mappen \"%s\"."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Töm papperskorgen"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "Ta bort alla meddelanden i papperskorgen?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2422,34 +2422,34 @@ msgstr ""
 "Vill du verkligen ta bort brevlådan \"%s\" ?\n"
 "(Meddelandena tas INTE bort från disken)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Ta bort brevlåda"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Vill du verkligen ta bort IMAP4-kontot \"%s\"?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Ta bort IMAP4-konto"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgrupp \"%s\"?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Ta bort diskussionsgrupp"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Vill du verkligen ta bort diskussionsgruppskonto \"%s\"?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Ta bort diskussionsgruppskonto"
 
@@ -2465,7 +2465,7 @@ msgstr "Ämne:"
 msgid "Creating header view...\n"
 msgstr "Skapar brevhuvudvy...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Inget Från)"
 
@@ -3245,7 +3245,7 @@ msgstr "/_Visa/_Teckenkodning/Kinesisk (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Visa/_Teckenkodning/Koreansk (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Visa/_Öppna i nytt fönster"
 
@@ -3525,8 +3525,8 @@ msgstr "Skapar huvudfönster...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Huvudfönster: färgtilldelning %d misslyckades\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "färdigt.\n"
 
@@ -3599,7 +3599,7 @@ msgstr "Sylpheed - Mappvy"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Meddelandevy"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Sva_ra"
 
@@ -3615,15 +3615,15 @@ msgstr "/Svara till av_sändaren"
 msgid "/Reply to mailing _list"
 msgstr "/Svara till e-post_lista"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Vi_darebefordra"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Vidarebefordra som _bilaga"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/_Omdirigera"
 
@@ -3708,8 +3708,8 @@ msgstr "Inst."
 msgid "Common preferences"
 msgstr "Allmänna inställningar"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Konto"
 
@@ -3741,7 +3741,7 @@ msgstr "Sök i aktuellt meddelande"
 msgid "Find text:"
 msgstr "Söktext:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Skiftlägeskänslig"
@@ -3786,24 +3786,24 @@ msgstr "Bilagor"
 msgid "Message View - Sylpheed"
 msgstr "Meddelandevy - Sylpheed"
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Kan inte spara filen \"%s\"."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr "Meddelandet kommer att skrivas ut med följande kommando:"
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 msgid "(Default print command)"
 msgstr "(Förvalt utskriftkommando)"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Skriv ut"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4176,7 +4176,7 @@ msgstr "Autentisera med POP3 innan brev skickas"
 msgid "Command output"
 msgstr "Kommandoutdata"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Sätt automatiskt följande adresser"
 
@@ -5456,7 +5456,7 @@ msgstr "Resultat av kommando"
 msgid "Age"
 msgstr "Ålder"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Markering"
@@ -5621,35 +5621,35 @@ msgstr "Åtgärd saknas"
 msgid "Folder properties"
 msgstr "Mappegenskaper"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "Symbol"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Typ"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Visa inte [...] eller (...) i början av ärendet i summering"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Ta bort [...] eller (...) i början av ärendet vid svar"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Gäller även undermappar"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "använd också vid svar"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Svara till:"
 
@@ -5658,20 +5658,20 @@ msgstr "Svara till:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Matcha någon av följande"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Matcha alla av följande"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Mapp"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Sökning misslyckades"
@@ -5687,19 +5687,19 @@ msgstr "Bilaga"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Ärende"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Från"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Datum"
 
@@ -6093,7 +6093,7 @@ msgstr "Kan inte hämta grupplista."
 msgid "Can't retrieve newsgroup list."
 msgstr "Kan inte hämta grupplista."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Färdig."
 
@@ -6121,7 +6121,7 @@ msgstr "Söker igenom mapp %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Inget datum)"
 
@@ -6139,346 +6139,350 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Filnamn"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Svar_a till"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/_Svara till/_alla"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/_Svara till/av_sändaren"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/_Svara till/e-post_lista"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Flytta..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopiera..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/_Markera"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/_Markera/_Markera"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "_Markera/_Avmarkera"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/_Markera/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/_Markera/Markera som _oläst"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/_Markera/Markera som _läst"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/_Markera/Markera alla som l_ästa"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/F_ärgmarkera"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/Redigera _om"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/_Lägg till avsändaren till adressboken"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/_Skapa filterregel"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Skapa filterregel/_Automatiskt"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Skapa filterregel/genom _Från"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Skapa filterregel/genom _Till"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Skapa filterregel/genom _Ämne"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Visa/_Källkod"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Visa/_Hela brevhuvudet"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Skriv _ut"
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Skapar summeringsvy...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/F_ärgmarkera"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Bilaga"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Sök"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Behandla markering"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Några markeringar finns kvar. Behandla dem?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Söker igenom mapp (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "_Sök igen"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Inga fler olästa meddelande"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Inget oläst meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Inga olästa meddelanden."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Inget oläst meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Inga fler nya meddelanden"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Inget nytt meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Inga nya meddelanden."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Inget nytt meddelande funnet. Gå till nästa mapp?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Inga fler markerade meddelanden"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Inget markerat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Inga markerade meddelanden."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Inget markerat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Inga fler färgade meddelanden"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Inget färgat meddelande funnet. Sök från slutet?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Inga färgade meddelanden."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Inget färgat meddelande funnet. Sök från början?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Attraherar meddelanden efter ärende..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d borttagen"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d flyttad"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopierad"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " objekt valda"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d nya, %d olästa, %d totalt (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d nya, %d olästa, %d totalt"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Sorterar summering..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tSkapar summering från meddelandedata..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Skapar summering från meddelandedata..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Skriver summeringscache (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Meddelande %d är markerat\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Meddelande %d är markerat som läst\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Meddelande %d är markerat som oläst\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Meddelande %s/%d är valt för borttagning\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Ta bort meddelande(n)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Vill du verkligen tömma papperkorgen?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Tar bort meddelandedubbletter..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Meddelande %s/%d är avmarkerat\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Meddelande %d är valt för att flyttas till %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Destinationen är samma som aktuell mapp."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Meddelandet %d är valt för att kopieras till %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "Destinationen att kopiera till är samma som aktuell mapp."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Fel uppstod när meddelanden behandlades."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Skapar trådar..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Avtrådar..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtrerar..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtrerar..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d meddelande(n) har filtrerats."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Nr."
 
@@ -6551,12 +6555,12 @@ msgstr "/_Meddelande/Mottag/Hämta från alla _konton"
 msgid "_Send queued messages"
 msgstr "Skicka köade meddelanden"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Om"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Avsluta"
diff --git a/po/tr.po b/po/tr.po
index 33747ce4..a07c1aac 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -24,196 +24,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Her hesap için yapılandırma dosyaları okunuyor...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "%s adresine yapılmış IMAP4 bağlantısı koptu. Yeniden bağlanılıyor...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP sunucu dizini"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "%s:%d adresine IMAP4 bağlantısı yapılıyor ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "TLS oturumuna bağlantı kurulamadı.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "%d. ileti siliniyor"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "%s%c%d mesajı %s  içine kopyalanıyor...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "silinen işaretler atanamıyor: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "silinemiyor\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "%s konumundan iletiler alınıyor..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "silinen işaretler atanamıyor: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "dizin kapatılamadı\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "%s kök dizini bulunamadı\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "LIST alınırken hata oluştu.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "%s oluşturulamadı\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "%s Gelen altında oluşturulamadı\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "posta kutusu yaratılamıyor: Liste hatası\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "posta kutusu oluşturulamadı\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "%s posta kutusunun adı %s olarak değiştirilemedi \n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "posta kutusu silinemedi\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "zarf alınamadı\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "İleti gönderiliyor (%d / %d bayt)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "zarf alınırken bir hata oluştu.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "zarf ayrıştırılamadı: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "IMAP4 sunucuya bağlantı kurulamadı: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "IMAP4 oturumuna %s:%d ile bağlantı kurulamadı\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "alanadına erişilemedi\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "dizin seçilemedi: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 yetkilendirmesi başarısız.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 girişinde hata.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "%s, %s üzerine eklenemedi\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(dosya gönderiliyor...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "ileti %s'ye eklenemiyor\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "%s, %s konumuna kopyalanamadı\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap komutu sırasında hata oluştu: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "EXPUNGE komutu sırasında hata oluştu\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "imap komutu sırasında hata oluştu: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv, UTF-7 yi %s'e çeviremedi\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv %s yi UTF-7'ye çeviremedi\n"
@@ -712,7 +712,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "İsim"
@@ -968,9 +968,9 @@ msgstr "/Yeni _Dizin"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -979,7 +979,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/Dü_zenle"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Sil"
 
@@ -992,7 +992,7 @@ msgid "Address book"
 msgstr "Adres defteri"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "İsim:"
 
@@ -1015,16 +1015,16 @@ msgstr "Ekle"
 msgid "Lookup"
 msgstr "Ara"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Kime:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1047,7 +1047,7 @@ msgstr ""
 "misiniz?\n"
 "Eğer sadece dizini silerseniz, içindeki adresler ana dizine taşınacaktır."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Dizini sil"
 
@@ -1255,7 +1255,7 @@ msgstr "Kahverengi"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Hiçbiri"
 
@@ -1346,7 +1346,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Dü_zenle/Otomatik ka_ydır"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Görünüm"
 
@@ -1600,7 +1600,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Çok parçalı mesajın bir kısmı alınamadı"
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Konu yok)"
 
@@ -1722,7 +1722,7 @@ msgstr "MIME türü"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Boyut"
 
@@ -1811,7 +1811,7 @@ msgstr "Özellikler"
 msgid "Encoding"
 msgstr "Kodlama"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Yol"
 
@@ -2038,12 +2038,12 @@ msgstr "Dizini düzenle"
 msgid "Input the new name of folder:"
 msgstr "Dizinin yeni adıni girin:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Yeni dizin"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Yeni dizinin adını verin:"
 
@@ -2211,42 +2211,42 @@ msgstr "Dizini seç"
 msgid "Select folder"
 msgstr "Dizini seç"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Gelen"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Gönderilen"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Kuyruk"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Çöp"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Taslaklar"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "YeniDizin"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' bir dizin adı içinde olamaz."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "`%s' dizini zaten var."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "`%s' dizini oluşturulamıyor."
@@ -2315,7 +2315,7 @@ msgstr "Yeni"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Okunmamış"
 
@@ -2365,22 +2365,22 @@ msgstr "Dizinlerde yeni mesajlar kontrol ediliyor..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "%s dizini seçildi\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "İletiler %s içine indiriliyor..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "İletiler `%s' içine indirilirken hata oluştu."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2390,26 +2390,26 @@ msgstr ""
 "(Eğer alt dizin içerecek bir dizin oluşturmak \n"
 "istiyorsanız, adının sonuna `/' karakteri getirin)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "`%s' için yeni bir isim verin:"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Dizini yeniden adlandır"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2418,12 +2418,12 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Dizini sil"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2434,21 +2434,21 @@ msgstr ""
 "`%s' altındaki tüm dizinler ve mesajlar silinecek.\n"
 "Devam etmek istediğinizden emin misiniz?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "`%s' dizini silinemiyor."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Çöpü boşalt"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Çöpteki tüm iletiler silinsin mi?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2457,34 +2457,34 @@ msgstr ""
 "`%s' posta kutusu kaldırılsın mı?\n"
 "(İletiler diskten silinmeyecektir)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Posta kutusunu sil"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "`%s' IMAP4 hesabı silinsin mi?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "IMAP4 hesabını sil"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "`%s' haber grubu silinsin mi?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Haber grubunu sil"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "`%s' haber grubu hesabı silinsin mi?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Haber grubu hesabını sil"
 
@@ -2500,7 +2500,7 @@ msgstr "Konu:"
 msgid "Creating header view...\n"
 msgstr "Başlık görünümü oluşturuluyor...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Kimden satırı yok)"
 
@@ -3282,7 +3282,7 @@ msgstr "/_Görünüm/_Kodlama/Çince (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Görünüm/_Kodlama/Korece (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Görünüm/Yeni _pencerede aç"
 
@@ -3566,8 +3566,8 @@ msgstr "Yeni pencere oluşturuluyor...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "AnaPencere: renk bölüştürmesi %d sırasında hata oluştu\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "bitti.\n"
 
@@ -3642,7 +3642,7 @@ msgstr "Sylheed - Dizin Görünümü"
 msgid "Sylpheed - Message View"
 msgstr "Sylpeed - İleti Görünümü"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Yanıtla"
 
@@ -3658,15 +3658,15 @@ msgstr "/_Gönderene yanıtla"
 msgid "/Reply to mailing _list"
 msgstr "/_E-posta listesine yanıtla"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Yönlendir"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/_Ek olarak yönlendir"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Ye_niden yönlendir"
 
@@ -3752,8 +3752,8 @@ msgstr "Tercihler"
 msgid "Common preferences"
 msgstr "Ortak tercihler"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Hesap"
 
@@ -3785,7 +3785,7 @@ msgstr "Şuanki mesajta bul"
 msgid "Find text:"
 msgstr "Metni bul:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Durum duyarlılığı"
@@ -3830,25 +3830,25 @@ msgstr "Ekler"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "`%s' dosyası kaydedilemedi."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Komut çalıştır"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Yazdır"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4228,7 +4228,7 @@ msgstr "Göndermeden önce POP3 ile kimlik denetimi yap"
 msgid "Command output"
 msgstr "Komut çıktısı"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Aşağıdaki adresleri otomatik olarak tanımla"
 
@@ -5531,7 +5531,7 @@ msgstr "Komut sonucu"
 msgid "Age"
 msgstr "Yaş"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "İşaretle"
@@ -5697,36 +5697,36 @@ msgstr "Eylem bulunamadı."
 msgid "Folder properties"
 msgstr " Dizin Ayarları"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Belirtici"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Tür"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Normal"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Özette başlığında başında [...] veya (...) gösterme"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Cevaplarken başlığın başındaki [...] veya (...) işaretlerini sil"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Alt dizinlere uygula"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "ayrıca yanıtlarken kullan"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Yanıtla:"
 
@@ -5735,20 +5735,20 @@ msgstr "Yanıtla:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Aşağıdaki herhangi bir kural eşleşirse"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Aşağıdaki tüm koşullar eşleşirse"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Dizin"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Aramada hata oluştu"
@@ -5764,19 +5764,19 @@ msgstr "Ek"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Konu"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Kimden"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Tarih"
 
@@ -6169,7 +6169,7 @@ msgstr "Haber grubu listesi alınamadı."
 msgid "Can't retrieve newsgroup list."
 msgstr "Haber grubu listesi alınamadı."
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Tamamlandı."
 
@@ -6197,7 +6197,7 @@ msgstr "%s dizini taranıyor..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Tarih Yok)"
 
@@ -6215,353 +6215,357 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Dosya adı"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/_Başkasına yanıtla"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/_Başkasına yanıtla/_herkese"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/_Başkasına yanıtla/_gönderene"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/_Başkasına yanıtla/posta _listesine"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/T_aşı..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Kopyala..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/İşa_retle"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/İşa_retle/_İşaretle"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/İşa_retle/_İşareti Kaldır"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/İşa_retle/--- "
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/İşa_retle/Okun_mamış olarak işaretle"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/İşa_retle/_Okunmuş olarak işaretle"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/İşa_retle/H_epsini okunmuş olarak işaretle"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/_Renk etiketi"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/_Yeniden düzenle"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/Göndericiyi adres defterine ekle"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/A_raçlar/Filtre _kuralı oluştur"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Otomatik oluştur"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Gönderene göre oluştur"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Alıcıya göre oluştur"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/A_raçlar/Filtre _kuralı oluştur/_Konuya göre oluştur"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Görünüm/_Kaynak"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Görünüm/Tüm _başlıklar"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/_Yazdır...."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Özet oluşturuluyor...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Renk etiketi"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Ek"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "Ara"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Süreç işareti"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Bazı işaretler bırakılmış. İşlemeye devam edilsin mi?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Dizin taranıyor (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "Yeniden ara"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Başka okunmamış ileti yok"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Okunmamış ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Okunmamış ileti yok."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Okunamamış ileti yok. Diğer dizine geçilsin mi?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Başka ileti yok"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Yeni ileti yok. Sondan itibaren aransın mı?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Yeni ileti yok."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Yeni ileti yok. Sonraki dizine geçilsin mi?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Başka işaretlenmiş posta yok"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "İşaretlenmiş ileti bulunamadı. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "İşaretlenmiş ileti yok."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "İşaretlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Başka etiketlenmiş ileti yok"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Başka etiketlenlenmiş ileti yok. Sondan aratılsın mı?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Başka etiketlenmiş ileti yok."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Etkiketlenmiş ileti bulunamadı. Baştan aratılsın mı?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Konularına göre postalar çekiliyor..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d silindi"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d taşındı"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d kopyalandı"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " öğe seçildi"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d yeni, %d okunmamış, toplam %d (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d yeni, %d okunmamış, toplam %d"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Özet sıralanıyor..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tİleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "İleti bilgisinden özet atanıyor..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Özet (%s) önbelleğe yazılıyor..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "%d. ileti işaretli\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "%d. ileti okunmuş olarak işaretli\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "%d ileti okunmamış olarak işaretli\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "%s/%d ileti silinecek\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "İletileri  sil"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Çöpteki iletileri silmek istiyor musunuz?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Çift iletiler siliniyor..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "%s%d iletisinin işareti kaldırıldı\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "%d iletisi %s e taşındı\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Hedef dizin şuanki dizinle aynı."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "%d iletisi %s e kopyalanadı\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "Kopya için hedef dizin geçerli dizin ile aynı."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "İletiler işlenirken hata oluştu."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Konumlar oluşturuluyor..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Konumlar ayrılıyor..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "filtreleniyor..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Filtreleniyor..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d mesaj filtrelenedi."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Hayır."
 
@@ -6638,12 +6642,12 @@ msgstr "/İ_leti/_Al/T_üm hesaplardan al"
 msgid "_Send queued messages"
 msgstr "Kuyruktaki iletileri gönder"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Hakkında"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Çık"
diff --git a/po/uk.po b/po/uk.po
index 91b4698d..08198952 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Sylpheed 2.1.4\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2005-10-22 17:21+0300\n"
 "Last-Translator: O.R. Nykyforchyn <nick@pu.if.ua>\n"
 "Language-Team: Ukrainian <uk@li.org>\n"
@@ -24,194 +24,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Читаємо конфігурацію для кожного запису...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "З'єднання IMAP4 до %s втрачено. Відновлюємо...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Сервер IMAP4 відключив LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "створення з'єднання INAP4 до %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Не вдалось почати сесію TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "Отримуємо лист %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Приєднуємо листи до %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Переносимо листи %s в %s ..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Копіюємо листи %s в %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "Видаляємо листи від %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "не вдалось встановити прапорець видалення: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "не вдалось очистити папку від видалених листів\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Видаляємо всі листи у %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "не вдалось встановити прапорець видалення: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "не вдалось закрити папку\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "коренева папка %s не існує\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "помилка при отриманні LIST'а.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Не вдалось створити '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Не вдалось створити '%s' всередині INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "не вдалось створити скриньку: невдача LIST\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "не вдалось створити скриньку\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "не вдалось перейменувати скриньку: %s на %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "не вдалось видалити скриньку\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "не вдалось отримати конверт\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Отримуємо заголовки листів (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "трапилась помилка при отриманні конверта.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "не вдалось розібрати конверт: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Не вдалось з'єднатись з сервером IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Не вдалось встановити сесію IMAP4 з: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "не вдалось отримати простір імен\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "не вдалось отримати папку: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "помилка при виконанні команди imap: STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Невдача авторизації IMAP4.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "не вдалось додати %s до %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(посилаємо файл...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "не вдалось приєднати лист до %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "не вдалось скопіювати %s в %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "помилка при виконанні команди imap:  STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "помилка при виконанні команди imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "помилка при виконанні команди imap: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv не може конвертувати UTF-7 в %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv не може конвертувати %s в UTF-7\n"
@@ -719,7 +719,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Ім'я"
@@ -973,9 +973,9 @@ msgstr "/Нова папка"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -984,7 +984,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/Редагувати"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/Видалити"
 
@@ -997,7 +997,7 @@ msgid "Address book"
 msgstr "Адресна книга"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Ім'я:"
 
@@ -1020,16 +1020,16 @@ msgstr "Додати"
 msgid "Lookup"
 msgstr "Пошук"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Кому:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Копія:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Приховано:"
 
@@ -1051,7 +1051,7 @@ msgstr ""
 "Чи бажаєте Ви видалити папку ТА всі адреси в `%s' ? \n"
 "Якщо видалити тільки папку, адреси буде перенесено в охоплюючу папку."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Видалити папку"
 
@@ -1253,7 +1253,7 @@ msgstr "Коричневий"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Ніякий"
 
@@ -1344,7 +1344,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/Редагувати/Автозгортання"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/Вигляд"
 
@@ -1574,7 +1574,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Не вдалось отримати одну з частин листа."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Без теми)"
 
@@ -1696,7 +1696,7 @@ msgstr "тип MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Розмір"
 
@@ -1785,7 +1785,7 @@ msgstr "Властивості"
 msgid "Encoding"
 msgstr "Кодування"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Шлях"
 
@@ -2006,12 +2006,12 @@ msgstr "Редагувати папку"
 msgid "Input the new name of folder:"
 msgstr "Введіть нову назву папки:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Нова папка"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Введіть назву нової папки:"
 
@@ -2178,42 +2178,42 @@ msgstr "Обрати папку"
 msgid "Select folder"
 msgstr "Обрати папку"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Вхідні"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Відіслані"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Черга"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Кошик"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Чернетки"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "НоваПапка"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' не може міститись в назві папки."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Папка `%s' вже існує."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Не вдалось створити папку `%s'."
@@ -2281,7 +2281,7 @@ msgstr "Нові"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Непрочитані"
 
@@ -2331,22 +2331,22 @@ msgstr "Перевірити за новими листами у всіх пап
 msgid "Junk"
 msgstr "Мотлох"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Папку %s обрано\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Завантажуємо листи у %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Трапилась помилка при завантаженні листів у `%s'."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2356,26 +2356,26 @@ msgstr ""
 "(якщо бажаєте створити папку, яка містить підпапки,\n"
 " додайте `/' в кінці назви)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Введіть нову назву для `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Перейменувати папку"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Не вдалось перенести папку `%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2384,12 +2384,12 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Видалити папку"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2402,20 +2402,20 @@ msgstr ""
 "\n"
 "Справді бажаєте видалити?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Не вдалось видалити папку `%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Спорожнити кошик"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "Видалити всі листи з кошика?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2424,34 +2424,34 @@ msgstr ""
 "Справді видалити скриньку `%s' ?\n"
 "(Листи НЕ видаляються з диска)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Видалити скриньку"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Справді видалити обліковий запис IMAP4 `%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Видалити обліковий запис IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Дійсно видалити конференцію `%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Видалити конференцію"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "Дійсно видалити обліковий запис конференції `%s'?"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Видалити обліковий запис конференції"
 
@@ -2467,7 +2467,7 @@ msgstr "Тема:"
 msgid "Creating header view...\n"
 msgstr "Створюємо область перегляду заголовка...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Без відправника)"
 
@@ -3247,7 +3247,7 @@ msgstr "/Вигляд/Кодова таблиця/Китайська (ISO-2022-_
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/Вигляд/Кодова таблиця/Корейська (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/Вигляд/Відкрити в новому вікні"
 
@@ -3527,8 +3527,8 @@ msgstr "Створюємо головне вікно...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Головне Вікно: невдача розміщення кольору %d\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "виконано.\n"
 
@@ -3602,7 +3602,7 @@ msgstr "Sylpheed - Папки"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Листи"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/Відповісти"
 
@@ -3618,15 +3618,15 @@ msgstr "/Відповісти відправникові"
 msgid "/Reply to mailing _list"
 msgstr "/Відповісти конференції"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/Переслати далі"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Переслати далі як вкладення"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Переспрямувати"
 
@@ -3711,8 +3711,8 @@ msgstr "Налаштування"
 msgid "Common preferences"
 msgstr "Спільні налаштування"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Обліковий запис"
 
@@ -3744,7 +3744,7 @@ msgstr "Знайти в поточному листі"
 msgid "Find text:"
 msgstr "Знайти текст:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Враховувати регістр"
@@ -3789,25 +3789,25 @@ msgstr "Вкладення"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Не вдалось зберегти файл `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Вивчення команди:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "Друк"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4180,7 +4180,7 @@ msgstr "Аутентифікація POP3 перед відсиланням"
 msgid "Command output"
 msgstr "Вивід команди"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Автоматично встановлювати наступні адреси"
 
@@ -5457,7 +5457,7 @@ msgstr "Результат команди"
 msgid "Age"
 msgstr "Давність"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Позначка"
@@ -5622,35 +5622,35 @@ msgstr "Дія не існує."
 msgid "Folder properties"
 msgstr "Властивості папки"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "Ідентифікатор"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Тип"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Нормальний"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Не показувати [...] чи (...) на початку теми у списку"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Видаляти [...] чи (...) на початку теми при відповіді"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Застосувати до підпапок"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "вживати і при відповіді"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Зворотня:"
 
@@ -5659,20 +5659,20 @@ msgstr "Зворотня:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Якщо виконано будь-яку з умов"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Якщо виконано всі умови"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Папка"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Невдача пошуку"
@@ -5688,19 +5688,19 @@ msgstr "Вкладення"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Тема"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Від"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Дата"
 
@@ -6093,7 +6093,7 @@ msgstr "Не вдалось отримати список конференцій
 msgid "Can't retrieve newsgroup list."
 msgstr "Не вдалось отримати список конференцій"
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Виконано."
 
@@ -6121,7 +6121,7 @@ msgstr "Перечитуємо папку %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Фільтрування..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Без дати)"
 
@@ -6139,346 +6139,350 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Ім'я файлу"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Відповісти"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Відповісти/всім"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Відповісти/відправникові"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Відповісти/конференції"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "Перемістити"
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/Копіювати"
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/Позначити"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/Позначити/Позначити"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/Позначити/Зняти виділення"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/Позначити/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Позначити/Позначити як непрочитане"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Позначити/Позначити як прочитане"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/Позначити/Позначити все як прочитане"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/Кольорова позначка"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "Змінити"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/Додати відправника до адресної книги"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/Створити правило фільтрування"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/Створити правило фільтрування/Автоматично"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/Створити правило фільтрування/За полем `Від'"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/Створити правило фільтрування/За полем `Кому'"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "//Створити правило фільтрування/За полем `Тема'"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/Вигляд/Вихідний текст"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/Вигляд/Весь заголовок"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/Друк..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Створюємо область перегляду списка...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/Кольорова позначка"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Вкладення"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Пошук "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Обробка позначок"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Залишились деякі позначки. Опрацювати?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Перечитуємо папку (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "Шукати знову"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Більше немає непрочитаних листів"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Не знайдено непрочитаних листів. Шукати з кінця?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Немає непрочитаних листів"
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Не знайдено непрочитаних листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Більше немає нових листів"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Не знайдено нових листів. Шукати з кінця?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Немає нових листів"
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Не знайдено нових листів. Перейти до наступної папки?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Більше немає позначених листів"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Не знайдено позначених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Немає позначених листів."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Не знайдено позначених листів. Шукати з початку?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Більше немає виділених листів"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Не знайдено виділених листів. Шукати з кінця?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Немає виділених листів"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Не знайдено виділених листів. Шукати з початку?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "Групування листів за темами..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d видалено"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d переміщено"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d скопійовано"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " записів обрано"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d нових, %d непрочитаних, %d загалом (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d нових, %d непрочитаних, %d загалом"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Сортуємо список..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tФормуємо список з даних листів..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Формуємо список з даних листів..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Пишемо кеш списка (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Лист %d позначено\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Лист %d позначено як прочитаний\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Лист %d позначено як непрочитаний\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Лист %s/%d призначено до видалення\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Видалити лист(и)"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Справді видалити лист(и) з кошика?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Видаляємо повторювані листи..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "З листа %s/%d знято позначки\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Лист %d призначено до переміщення в %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Призначення збігається з поточною папкою."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Лист %d призначено до копіювання в %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "Пропонується копіювання з папки в неї ж."
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "При обробці пошти трапилась помилка."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Будуємо нитки обговорення..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Скасування ниток обговорення..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "фільтрування..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Фільтрування..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d листів відфільтровано."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Номер"
 
@@ -6551,12 +6555,12 @@ msgstr "/Лист/Отримати/Для всіх записів"
 msgid "_Send queued messages"
 msgstr "Відіслати лист(и) з черги"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Про програму"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Вихід"
diff --git a/po/vi.po b/po/vi.po
index fcff5478..902b596a 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+0900\n"
 "PO-Revision-Date: 2005-11-30 23:05+0700\n"
 "Last-Translator: Pham Thanh Long <ptlong@gmail.com>\n"
 "Language-Team: Vietnamese <gnome-vi-list@gnome.org>\n"
@@ -19,195 +19,195 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "Đang đọc mọi cấu hình cho mỗi tài khoản...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "Kết nối IMAP4 tới %s đã bị ngắt. Đang kết nối lại...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "Máy chủ IMAP4 cấm LOGIN.\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "đang tạo kết nối IMAP4 tới %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "Không thể khởi động phiên TLS.\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "Đang lấy thư %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "Đang ghép thư vào %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "Đang chuyển thư %s tới %s ..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "Đang chép thư %s tới %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "Đang xoá thư %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "không thể đặt cờ đã xoá: %s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "không thể xoá\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "Xoá mọi thư trong %s"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "không thể đặt cờ đã xoá: 1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "không thể đóng thư mục\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "thư mục gốc %s không tồn tại\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "xảy ra lỗi khi lấy LIST.\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "Không thể tạo '%s'\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "Không thể tạo '%s' ở INBOX\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "không thể tạo hộp thư: LIST thất bại\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "không thể tạo hộp thư\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "không thể đổi tên hộp thư: %s thành %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "không thể xoá hộp thư\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "không thể lấy phong bì\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "Đang lấy header của thư (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "xảy ra lỗi khi lấy phong bì.\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "không thể phân tích phong bì: %s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "Không thể kết nối tới máy chủ IMAP4: %s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "Không thể tạo phiên IMAP4 với: %s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "không thể lấy khoảng định danh (namespace)\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "không thể chọn thư mục: %s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "Xác thực IMAP4 thất bại:\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "Đăng nhập IMAP4 thất bại.\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "không thể ghep %s vào %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(đang gửi tập tin...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "không thể ghép thư vào %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "không thể chép %s tới %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "có lỗi khi chạy lệnh imap: STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "có lỗi khi chạy lệnh imap: EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "có lỗi khi chạy lệnh imap: CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv không thể chuyển UTF-7 sang %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv không thể chuyển %s sang UTF-7\n"
@@ -697,7 +697,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "Tên"
@@ -951,9 +951,9 @@ msgstr "/Thư _mục mới"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -962,7 +962,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/_Soạn"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/_Xoá"
 
@@ -975,7 +975,7 @@ msgid "Address book"
 msgstr "Sổ địa chỉ"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "Tên:"
 
@@ -998,16 +998,16 @@ msgstr "Thêm"
 msgid "Lookup"
 msgstr "Tra cứu"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "Người nhận:"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "Cc:"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "Bcc:"
 
@@ -1029,7 +1029,7 @@ msgstr ""
 "Bạn có muốn xoá thư mục VÀ mọi địa chỉ trong `%s' ?\n"
 "Nếu chỉ xoá thư mục, các địa chỉ sẽ được chuyển đến thư mục cấp cao hơn."
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "Xoá thư mục"
 
@@ -1235,7 +1235,7 @@ msgstr "Nâu"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "Không"
 
@@ -1326,7 +1326,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/_Soạn/Tự độ_ng khuôn dòng"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/_Xem"
 
@@ -1556,7 +1556,7 @@ msgid "Can't get the part of multipart message."
 msgstr "Không thể lấy thành phần cho thư nhiều thành phần."
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(Không tiêu đề)"
 
@@ -1678,7 +1678,7 @@ msgstr "Kiểu MIME"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "Kích thước"
 
@@ -1767,7 +1767,7 @@ msgstr "Thuộc tính"
 msgid "Encoding"
 msgstr "Mã hoá"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "Đường dẫn"
 
@@ -1988,12 +1988,12 @@ msgstr "Sửa thư mục"
 msgid "Input the new name of folder:"
 msgstr "Đặt tên mới cho thư mục:"
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "Thư mục mới"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "Đặt tên cho thư mục mới:"
 
@@ -2161,42 +2161,42 @@ msgstr "Chọn thư mục"
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "Hộp nhận"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "Đã gửi"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "Đợi gửi"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "Thùng rác"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "Nháp"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "Thư mục mới"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "`%c' không được có trong tên thư mục."
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "Thư mục `%s' đã có trước."
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "Không tạo được thư mục `%s'."
@@ -2264,7 +2264,7 @@ msgstr "Mới"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "Chưa đọc"
 
@@ -2314,22 +2314,22 @@ msgstr "Kiểm tra thư mới trong mọi thư mục..."
 msgid "Junk"
 msgstr "Rác"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "Thư mục %s được chọn\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "Đang tải thư về trong %s ..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "Có lỗi khi tải thư về trong `%s'."
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2339,26 +2339,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:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "Đặt tên cho `%s':"
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "Đổi tên thư mục"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "Không thể xoá thư mục `%s'."
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "Không thể di chuyển thư mục `%s'."
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2367,12 +2367,12 @@ 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:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "Xoá thư mục"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2385,21 +2385,21 @@ msgstr ""
 "\n"
 "Bạn có thực sự muốn xoá không?"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "Không thể xoá thư mục `%s'."
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "Đổi rác"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "Xoá mọi thư trong thùng rác?"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2408,34 +2408,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:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "Xoá hộp thư"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "Thực sự muốn xoá tài khoản IMAP4 `%s'?"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "Xoá tài khoản IMAP4"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "Thực sự muốn xoá nhóm tin `%s'?"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "Xoá nhóm tin"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, 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:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "Xoá tài khoản tin tức"
 
@@ -2451,7 +2451,7 @@ msgstr "Tiêu đề:"
 msgid "Creating header view...\n"
 msgstr "Đang tạo khung xem header...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(Không rõ người gửi)"
 
@@ -3233,7 +3233,7 @@ msgstr "/_Xem/Mã _kí tự/Hán (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/_Xem/Mã _kí tự/Triều Tiên (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/_Xem/_Mở trong cửa sổ mới"
 
@@ -3513,8 +3513,8 @@ msgstr "Đang tạo cửa sổ chính...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "Cửa sổ chính: việc cấp màu %d thất bại\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "xong.\n"
 
@@ -3589,7 +3589,7 @@ msgstr "Sylpheed - Khung thư mục"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - Khung đọc thư"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/_Hồi âm"
 
@@ -3605,15 +3605,15 @@ msgstr "/Hồi âm cho người _gửi"
 msgid "/Reply to mailing _list"
 msgstr "/Hồi âm cho _hộp thư chung"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/_Chuyển tiếp"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/Ch_uyển tiếp ở dạng đính kèm"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/Chu_yển hướng"
 
@@ -3698,8 +3698,8 @@ msgstr ""
 msgid "Common preferences"
 msgstr "Cấu hình chung"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "Tài khoản"
 
@@ -3731,7 +3731,7 @@ msgstr "Tìm trong thư hiện tại"
 msgid "Find text:"
 msgstr "Tìm văn bản:"
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "Phân biệt chữ hoa/thường"
@@ -3776,25 +3776,25 @@ msgstr "Đính kèm"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "Không thể lưu tập tin `%s'."
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "Lệnh thu thập:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "In ấn"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4165,7 +4165,7 @@ msgstr "Xác thực với POP3 trước khi gửi"
 msgid "Command output"
 msgstr "Đầu ra của lệnh"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "Tự động đặt địa chỉ sau"
 
@@ -5447,7 +5447,7 @@ msgstr "Kết quả của lệnh"
 msgid "Age"
 msgstr "Tuổi"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "Đánh dấu"
@@ -5612,36 +5612,36 @@ msgstr "Hành động không tồn tại."
 msgid "Folder properties"
 msgstr "Thuộc tính thư mục"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "Kí hiệu"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "Loại"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "Bình thường"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "Không hiển thị [...] hoặc (...) ở đầu tiêu đề trong bảng tóm tắt"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "Xoá [...] hoặc (...) ở đầu tiêu đề khi hồi âm"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "Áp dụng cho thư mục con"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "dùng cho cả lúc hồi âm"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "Reply-To:"
 
@@ -5650,20 +5650,20 @@ msgstr "Reply-To:"
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "Khớp với bất kì phần nào dưới đây"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "Khớp với tất cả các phần dưới đây"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "Thư mục"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "Tìm kiếm thất bại"
@@ -5679,19 +5679,19 @@ msgstr "Đính kèm"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "Tiêu đề"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "Người gửi"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "Thời gian"
 
@@ -6082,7 +6082,7 @@ msgstr "Không lấy được danh sách nhóm tin"
 msgid "Can't retrieve newsgroup list."
 msgstr "Không lấy được danh sách nhóm tin"
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "Xong."
 
@@ -6110,7 +6110,7 @@ msgstr "Đang quét thư mục %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "Đang lọc..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(Không ngày tháng)"
 
@@ -6128,351 +6128,355 @@ msgstr ""
 msgid "Folder name:"
 msgstr "Tên tập tin"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/Hồi â_m cho"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/Hồi â_m cho/_tất cả"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/Hồi â_m cho/_người gửi"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/Hồi â_m cho/_hộp thư chung"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/_Di chuyển..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/_Sao chép"
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/Đánh _dấu"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/Đánh _dấu/Đánh _dấu"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/Đánh _dấu/_Bỏ đánh dấu"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/Đánh _dấu/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/Đánh _dấu/Đá_nh dấu là chưa đọc"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/Đánh _dấu/Đán_h dấu đã đọc"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/Đánh _dấu/Đánh dấ_u đã đọc hết"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/_Nhãn màu"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/S_oạn lại"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/_Thêm người gửi vào sổ địa chỉ..."
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 #, fuzzy
 msgid "/Create f_ilter rule"
 msgstr "/_Công cụ/Tạo _quy tắc lọc"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 #, fuzzy
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/_Tự động"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 #, fuzzy
 msgid "/Create f_ilter rule/by _From"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo _Người gửi"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 #, fuzzy
 msgid "/Create f_ilter rule/by _To"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo N_gười nhận"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 #, fuzzy
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/_Công cụ/Tạo _quy tắc lọc/theo Tiê_u đề"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/_Xem/_Nguồn"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/_Xem/Mọi _header"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/I_n ấn..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "Đang tạo khung xem tóm tắt...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/_Nhãn màu"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "Đính kèm"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr " Tìm kiếm "
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "Đánh dấu tiến trình"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "Vẫn còn sót một số dấu. Xử lí chúng?"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "Đang quét thư mục (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "_Tìm lại"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "Không có thêm thư chưa đọc"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "Không thấy thư nào chưa đọc. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "Không có thư nào chưa đọc."
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "Không thấy thư nào chưa đọc. Chuyển sang thư mục tiếp theo?"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "Không có thêm thư mới"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "Không có thư mới. Tìm từ dưới lên?"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "Không có thư mới."
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "Không thấy thư mới nào. Tìm trong thư mục tiếp theo?"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "Không có thêm thư được đánh dấu"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "Không có thư nào được dánh dấu."
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "Không thấy thư nào được đánh dấu. Tìm từ đầu?"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "Không có thêm thư được đánh dấu nào"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "Không thấy nào được gán nhãn. Tìm từ cuối lên?"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "Không có thư được gán nhãn."
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "Không thấy thư nào được gán nhãn. Tìm từ đầu?"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr ""
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "đã xoá %d"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "đã chuyển %s%d"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr ", "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "đã chép %s%d"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " mục được chọn"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d mới, %d chưa đọc, %d tổng số (%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d mới, %d chưa đọc, %d tổng số"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "Đang sắp xếp bảng tóm tắt..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\tĐang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "Đang thiết lập tóm tắt từ dữ liệu thư..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "Đang ghi bộ đệm cho phần tóm tắt (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "Bức thư %d đã được đánh dấu\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "Bức thư %d được đánh dấu là đã đọc\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "Bức thư %d được đánh dấu là chưa đọc\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "Bức thư %s/%d được chọn để xoá\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "Xoá thư"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "Bạn có thực sự muốn xoá thư khỏi thùng rác?"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "Đang xoá thư trùng nhau..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "Thư %s/%d được bỏ đánh đấu\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "Bức thư %d được chọn để chuyển tới %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại."
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "Bức thư %d được chọn để chép đến %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "Đích đến trùng với thư mục hiện tại"
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "Có lỗi khi xử lí thư."
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "Đang tạo luồng..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "Đang rời luồng..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "đang lọc..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "Đang lọc..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "%d thư đã được lọc."
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "Số "
 
@@ -6545,12 +6549,12 @@ msgstr "/_Thư/_Nhận/Từ _mọi tài khoản"
 msgid "_Send queued messages"
 msgstr "Gửi thư đang đợi"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "Giới thiệu"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "Thoát"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f1d8de32..ef1e544a 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -20,196 +20,196 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "正在读取所有帐号的配置...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 连接已断开。正在重新连接...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 #, fuzzy
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 服务器目录"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在创建到 %s:%d 的 IMAP4 连接...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "无法启动 TLS 会话。\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, fuzzy, c-format
 msgid "Getting message %d"
 msgstr "正在删除邮件 %d"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, fuzzy, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, fuzzy, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "正在移动邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, fuzzy, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在复制邮件 %s%c%d 到 %s ...\n"
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, fuzzy, c-format
 msgid "Removing messages %s"
 msgstr "正在从 %s 获取邮件..."
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "无法设置删除标志：%s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "无法清除\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, fuzzy, c-format
 msgid "Removing all messages in %s"
 msgstr "正在从 %s 获取邮件..."
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "无法设置删除标志：1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "无法关闭文件夹\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根文件夹 %s 不存在\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "获取列表时发生错误。\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "无法创建“%s”\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "无法在收件箱中创建“%s”\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "无法创建邮箱：LIST 失败\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "无法创建邮箱\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "无法将邮箱 %s 重命名为 %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "无法删除邮箱\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "无法获取信封\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, fuzzy, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "正在发送邮件 (%d / %d 字节)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "获取信封时发生错误。\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "无法解析信封：%s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "无法连接到IMAP4服务器：%s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "无法获得名字空间\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "无法选择文件夹：%s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 #, fuzzy
 msgid "error on imap command: STATUS\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 验证失败。\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登录失败。\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "无法把 %s 添加到 %s\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "(正在发送文件...)"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "无法追加邮件到 %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "无法将 %s 复制到 %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "执行IMAP命令时发生错误：STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "执行IMAP命令时发生错误：EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "执行IMAP命令时发生错误：CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "iconv 无法转换 UTF-7 到 %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "iconv 无法转换 %s 到 UTF-7\n"
@@ -706,7 +706,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "名称"
@@ -962,9 +962,9 @@ msgstr "/新建文件夹(_F)"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -973,7 +973,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/编辑(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/删除(_D)"
 
@@ -986,7 +986,7 @@ msgid "Address book"
 msgstr "地址簿"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "姓名："
 
@@ -1009,16 +1009,16 @@ msgstr "添加"
 msgid "Lookup"
 msgstr "查找"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "收件人："
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "抄送："
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "密件抄送："
 
@@ -1040,7 +1040,7 @@ msgstr ""
 "您要删除“%s”中的文件夹和所有地址吗？\n"
 "如果仅删除文件夹，地址将被移到上一级文件夹中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "删除文件夹"
 
@@ -1241,7 +1241,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "没有"
 
@@ -1332,7 +1332,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/编辑(_E)/自动折行(_O)"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/查看(_V)"
 
@@ -1565,7 +1565,7 @@ msgid "Can't get the part of multipart message."
 msgstr "无法获得分块邮件的分块。"
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "(没有主题)"
 
@@ -1686,7 +1686,7 @@ msgstr "MIME 类型"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "大小"
 
@@ -1775,7 +1775,7 @@ msgstr "属性"
 msgid "Encoding"
 msgstr "编码方式"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路径"
 
@@ -2000,12 +2000,12 @@ msgstr "编辑文件夹"
 msgid "Input the new name of folder:"
 msgstr "输入文件夹的新名字："
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "新建文件夹"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "输入新建文件夹的名字："
 
@@ -2173,42 +2173,42 @@ msgstr "邮件池目录"
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件箱"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "已发送"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "队列"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "废件箱"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿箱"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "新文件夹"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "字符“%c”不能包含在文件夹名字中。"
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "文件夹“%s”已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "无法创建文件夹“%s”。"
@@ -2277,7 +2277,7 @@ msgstr "新建"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "未读"
 
@@ -2327,22 +2327,22 @@ msgstr "正在检查所有文件夹中的新邮件..."
 msgid "Junk"
 msgstr ""
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "选中文件夹 %s\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "正在下载 %s 中的邮件..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "下载“%s”中的邮件时发生错误。"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2352,26 +2352,26 @@ msgstr ""
 "(如果您要创建一个保存子文件夹的文件夹，\n"
 "在名字的最后添加“/”)"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "输入“%s”的新名字："
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "重命名文件件"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, fuzzy, c-format
 msgid "Can't move the folder `%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2380,12 +2380,12 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "删除文件夹"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2396,21 +2396,21 @@ msgstr ""
 "“%s”下的所有文件夹和邮件将被删除。\n"
 "您真的要删除吗？"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "无法删除文件夹“%s”。"
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "清空废件箱"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 #, fuzzy
 msgid "Delete all messages in the trash folder?"
 msgstr "清空废件箱里的所有信件？"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2419,34 +2419,34 @@ msgstr ""
 "真的要删除邮件箱“%s”？\n"
 "(邮件不会从磁盘删除)"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "删除邮箱"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "真的要删除 IMAP4 帐号“%s”？"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "删除 IMAP4 帐号"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "真的要删除新闻组“%s”？"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "删除新闻组"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "真到要删除新闻组帐号“%s”？"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "删除新闻组帐号"
 
@@ -2462,7 +2462,7 @@ msgstr "标题："
 msgid "Creating header view...\n"
 msgstr "正在创建标题视图...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "(没有发件人)"
 
@@ -3235,7 +3235,7 @@ msgstr "/查看(_V)/字符编码(_E)/中文 (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/查看(_V)/字符编码(_E)/朝鲜语 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/查看(_V)/在新窗口中打开(_W)"
 
@@ -3520,8 +3520,8 @@ msgstr "正在创建主窗口...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主窗口：分配颜色 %d 失败\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3595,7 +3595,7 @@ msgstr "Sylpheed－文件夹视图"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed－邮件视图"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/回复(_R)"
 
@@ -3611,15 +3611,15 @@ msgstr "/回复到发件人(_S)"
 msgid "/Reply to mailing _list"
 msgstr "/回复到邮件列表(_L)"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/转发(_F)"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/作为附件转发(_W)"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/重定向(_T)"
 
@@ -3705,8 +3705,8 @@ msgstr "首选项"
 msgid "Common preferences"
 msgstr "通用首选项"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "帐号"
 
@@ -3738,7 +3738,7 @@ msgstr "在当前邮件中查找"
 msgid "Find text:"
 msgstr "查找文字："
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "区分大小写"
@@ -3783,25 +3783,25 @@ msgstr "附件"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "无法保存文件“%s”'。"
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "执行命令"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "打印"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4175,7 +4175,7 @@ msgstr "发送前用POP3验证"
 msgid "Command output"
 msgstr "命令输出"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "自动设置以下地址"
 
@@ -5464,7 +5464,7 @@ msgstr "命令结果"
 msgid "Age"
 msgstr "邮件时间"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "标记"
@@ -5630,36 +5630,36 @@ msgstr "不存在的动作。"
 msgid "Folder properties"
 msgstr "文件夹属性"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 #, fuzzy
 msgid "Identifier"
 msgstr "说明符"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "类型"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "普通"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "在摘要中主题之前不显示 [...] 或 (...)"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回复时删除主题前的 [...] 或 (...)"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "应用到子文件夹"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "回复时也使用"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "回复至："
 
@@ -5668,20 +5668,20 @@ msgstr "回复至："
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "匹配以下任何"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "匹配以下所有"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "文件夹"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "搜索失败"
@@ -5697,19 +5697,19 @@ msgstr "附件"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "主题"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "发件人"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "日期"
 
@@ -6103,7 +6103,7 @@ msgstr "无法取回新闻组列表。"
 msgid "Can't retrieve newsgroup list."
 msgstr "无法取回新闻组列表。"
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "完成。"
 
@@ -6131,7 +6131,7 @@ msgstr "正在扫描文件夹 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(没有日期)"
 
@@ -6149,348 +6149,352 @@ msgstr ""
 msgid "Folder name:"
 msgstr "文件名"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/回复到(_Y)"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/回复到(_Y)/全部(_A)"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/回复到(_Y)/发件人(_S)"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/回复到(_Y)/邮件列表(_L)"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/移动(_O)..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/复制(_C)..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/标记(_M)"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/标记(_M)/标记(_M)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/标记(_M)/取消标记(_U)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/标记(_M)/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/标记(_M)/标记为未读(_E)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/标记(_M)/标记为已读(_D)"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/标记(_M)/全部标记为已读(_R)"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/颜色标签(_B)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/重新编辑(_E)"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 #, fuzzy
 msgid "/Add sender to address boo_k..."
 msgstr "/添加发件人到地址簿(_K)"
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/创建过滤规则(_i)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/创建过滤规则(_i)/自动(_A)"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/创建过滤规则(_i)/按发件人(_F)"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/创建过滤规则(_i)/按收件人(_T)"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/创建过滤规则(_i)/按主题(_S)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/查看(_V)/原文(_S)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/查看(_V)/所有标题(_H)"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/打印(_P)..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "正在创建摘要视图...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/颜色标签(_B)"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "附件"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "搜索"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "处理标志"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "有一些剩余标记。处理吗？"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "正在扫描文件夹 (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 #, fuzzy
 msgid "_Search again"
 msgstr "再次查找"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "没发现未读邮件。从后面开始查找？"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "没有未读邮件"
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "没发现未读邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "没发现新邮件。从后面开始查找？"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "没有新邮件"
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "没发现新邮件。到下一个文件夹？"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "没有标记过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "没有标记过的邮件"
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "没有标记过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "没有找到用颜色标注过的邮件"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "没有找到用颜色标注过的邮件。从后面开始查找？"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "没有用颜色标注的邮件。"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "没有找到用颜色标注过的邮件。从前面开始查找？"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "正在按标题归类邮件..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "删除了 %d 个邮件"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "移动了 %s%d"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr "，"
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "复制了 %s%d"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " 项被选中"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 个新邮件，%d 个未读邮件，共 %d 个邮件(%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 个新邮件邮件，%d 个未读邮件，共 %d 个邮件"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "正在排序摘要..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\t正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "正在从邮件数据中设置摘要..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "正在写摘要缓存(%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "邮件 %d 被标记\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "邮件 %d 被标记为已读\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "邮件 %d 被标记为未读\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "邮件 %s/%d 设置为要删除\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "删除邮件"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您确实要删除废件箱中的邮件吗？"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "正在删除重复邮件..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "邮件 %s/%d 被取消标记\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "邮件 %d 被设置为移到 %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "目标与当前文件夹相同。"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "邮件 %d 被设置为复制到 %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "复制目标与当前文件夹相同。"
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "处理邮件时发生错误。"
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "正在创建线索..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "正在取消线索..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "正在过滤..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已经过滤 %d 个邮件。"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "No."
 
@@ -6566,12 +6570,12 @@ msgstr "/邮件(_M)/接收(_V)/所有帐号(_A)"
 msgid "_Send queued messages"
 msgstr "发送队列中的邮件"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "关于"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "退出"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f78ba761..28f5363d 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-01-19 15:52+0900\n"
+"POT-Creation-Date: 2006-01-20 14:56+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"
@@ -21,194 +21,194 @@ msgstr ""
 msgid "Reading all config for each account...\n"
 msgstr "讀取所有帳號的設定中...\n"
 
-#: libsylph/imap.c:464
+#: libsylph/imap.c:465
 #, c-format
 msgid "IMAP4 connection to %s has been disconnected. Reconnecting...\n"
 msgstr "到 %s 的 IMAP4 連線被中斷了。重新連線中...\n"
 
-#: libsylph/imap.c:515 libsylph/imap.c:521
+#: libsylph/imap.c:516 libsylph/imap.c:522
 msgid "IMAP4 server disables LOGIN.\n"
 msgstr "IMAP4 伺服器停用登入。\n"
 
-#: libsylph/imap.c:596
+#: libsylph/imap.c:597
 #, c-format
 msgid "creating IMAP4 connection to %s:%d ...\n"
 msgstr "正在產生 IMAP4 連線到 %s:%d ...\n"
 
-#: libsylph/imap.c:637
+#: libsylph/imap.c:638
 msgid "Can't start TLS session.\n"
 msgstr "無法開啟 TLS 連線\n"
 
-#: libsylph/imap.c:1107
+#: libsylph/imap.c:1108
 #, c-format
 msgid "Getting message %d"
 msgstr "擷取第 %d 號郵件"
 
-#: libsylph/imap.c:1224
+#: libsylph/imap.c:1225
 #, c-format
 msgid "Appending messages to %s (%d / %d)"
 msgstr "附加郵件至 %s (%d / %d)"
 
-#: libsylph/imap.c:1316
+#: libsylph/imap.c:1317
 #, c-format
 msgid "Moving messages %s to %s ..."
 msgstr "正在移動郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1322
+#: libsylph/imap.c:1323
 #, c-format
 msgid "Copying messages %s to %s ..."
 msgstr "正在複製郵件 %s 到 %s ..."
 
-#: libsylph/imap.c:1473
+#: libsylph/imap.c:1474
 #, c-format
 msgid "Removing messages %s"
 msgstr "正在移除郵件 %s"
 
-#: libsylph/imap.c:1479
+#: libsylph/imap.c:1480
 #, c-format
 msgid "can't set deleted flags: %s\n"
 msgstr "無法設定刪除的旗標：%s\n"
 
-#: libsylph/imap.c:1487 libsylph/imap.c:1582
+#: libsylph/imap.c:1488 libsylph/imap.c:1583
 msgid "can't expunge\n"
 msgstr "無法刪除\n"
 
-#: libsylph/imap.c:1570
+#: libsylph/imap.c:1571
 #, c-format
 msgid "Removing all messages in %s"
 msgstr "正在移除 %s 中的所有郵件"
 
-#: libsylph/imap.c:1576
+#: libsylph/imap.c:1577
 msgid "can't set deleted flags: 1:*\n"
 msgstr "無法設定刪除的旗標：1:*\n"
 
-#: libsylph/imap.c:1621
+#: libsylph/imap.c:1622
 msgid "can't close folder\n"
 msgstr "無法選擇資料夾\n"
 
-#: libsylph/imap.c:1699
+#: libsylph/imap.c:1700
 #, c-format
 msgid "root folder %s not exist\n"
 msgstr "根資料夾 %s 不存在。\n"
 
-#: libsylph/imap.c:1883 libsylph/imap.c:1891
+#: libsylph/imap.c:1889 libsylph/imap.c:1897
 msgid "error occurred while getting LIST.\n"
 msgstr "取得 LIST 時發生錯誤。\n"
 
-#: libsylph/imap.c:2005
+#: libsylph/imap.c:2011
 #, c-format
 msgid "Can't create '%s'\n"
 msgstr "無法產生 %s\n"
 
-#: libsylph/imap.c:2010
+#: libsylph/imap.c:2016
 #, c-format
 msgid "Can't create '%s' under INBOX\n"
 msgstr "無法在收件夾下產生 %s\n"
 
-#: libsylph/imap.c:2071
+#: libsylph/imap.c:2077
 msgid "can't create mailbox: LIST failed\n"
 msgstr "無法產生信箱：LIST 失敗\n"
 
-#: libsylph/imap.c:2091
+#: libsylph/imap.c:2097
 msgid "can't create mailbox\n"
 msgstr "無法產生信箱\n"
 
-#: libsylph/imap.c:2187
+#: libsylph/imap.c:2193
 #, c-format
 msgid "can't rename mailbox: %s to %s\n"
 msgstr "信箱 %s 無法更名為 %s\n"
 
-#: libsylph/imap.c:2267
+#: libsylph/imap.c:2273
 msgid "can't delete mailbox\n"
 msgstr "無法刪除信箱\n"
 
-#: libsylph/imap.c:2311
+#: libsylph/imap.c:2317
 msgid "can't get envelope\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:2324
+#: libsylph/imap.c:2330
 #, c-format
 msgid "Getting message headers (%d / %d)"
 msgstr "擷取郵件表頭 (%d / %d)"
 
-#: libsylph/imap.c:2334
+#: libsylph/imap.c:2340
 msgid "error occurred while getting envelope.\n"
 msgstr "取得信封時發生錯誤。\n"
 
-#: libsylph/imap.c:2356
+#: libsylph/imap.c:2362
 #, c-format
 msgid "can't parse envelope: %s\n"
 msgstr "無法解析信封：%s\n"
 
-#: libsylph/imap.c:2480
+#: libsylph/imap.c:2486
 #, c-format
 msgid "Can't connect to IMAP4 server: %s:%d\n"
 msgstr "無法連線到 IMAP4 伺服器：%s:%d\n"
 
-#: libsylph/imap.c:2487
+#: libsylph/imap.c:2493
 #, c-format
 msgid "Can't establish IMAP4 session with: %s:%d\n"
 msgstr "無法產生 IMAP4 連線：%s:%d\n"
 
-#: libsylph/imap.c:2562
+#: libsylph/imap.c:2568
 msgid "can't get namespace\n"
 msgstr "無法取得信封。\n"
 
-#: libsylph/imap.c:3090
+#: libsylph/imap.c:3096
 #, c-format
 msgid "can't select folder: %s\n"
 msgstr "無法選擇資料夾：%s\n"
 
-#: libsylph/imap.c:3125
+#: libsylph/imap.c:3131
 msgid "error on imap command: STATUS\n"
 msgstr "發生錯誤的 imap 命令： STATUS\n"
 
-#: libsylph/imap.c:3268
+#: libsylph/imap.c:3274
 msgid "IMAP4 authentication failed.\n"
 msgstr "IMAP4 認證失敗\n"
 
-#: libsylph/imap.c:3285
+#: libsylph/imap.c:3291
 msgid "IMAP4 login failed.\n"
 msgstr "IMAP4 登入失敗。\n"
 
-#: libsylph/imap.c:3621
+#: libsylph/imap.c:3627
 #, c-format
 msgid "can't append %s to %s\n"
 msgstr "無法將郵件從 %s 搬移到 %s。\n"
 
-#: libsylph/imap.c:3628
+#: libsylph/imap.c:3634
 msgid "(sending file...)"
 msgstr "（送出檔案 ...）"
 
-#: libsylph/imap.c:3657
+#: libsylph/imap.c:3663
 #, c-format
 msgid "can't append message to %s\n"
 msgstr "無法附加訊息到 %s\n"
 
-#: libsylph/imap.c:3689
+#: libsylph/imap.c:3695
 #, c-format
 msgid "can't copy %s to %s\n"
 msgstr "無法將郵件 %s 移到 %s\n"
 
-#: libsylph/imap.c:3713
+#: libsylph/imap.c:3719
 #, c-format
 msgid "error while imap command: STORE %s %s\n"
 msgstr "imap 發生錯誤，命令為： STORE %s %s\n"
 
-#: libsylph/imap.c:3727
+#: libsylph/imap.c:3733
 msgid "error while imap command: EXPUNGE\n"
 msgstr "imap 發生錯誤，命令為： EXPUNGE\n"
 
-#: libsylph/imap.c:3740
+#: libsylph/imap.c:3746
 msgid "error while imap command: CLOSE\n"
 msgstr "imap 發生錯誤，命令為： CLOSE\n"
 
-#: libsylph/imap.c:4007
+#: libsylph/imap.c:4013
 #, c-format
 msgid "iconv cannot convert UTF-7 to %s\n"
 msgstr "無法將 UTF-7 轉換為 %s\n"
 
-#: libsylph/imap.c:4037
+#: libsylph/imap.c:4043
 #, c-format
 msgid "iconv cannot convert %s to UTF-7\n"
 msgstr "無法轉換 %s 為 UTF-7\n"
@@ -711,7 +711,7 @@ msgstr ""
 #: src/compose.c:4244 src/editaddress.c:200 src/editaddress.c:942
 #: src/editaddress.c:990 src/editbook.c:196 src/editgroup.c:265
 #: src/editjpilot.c:271 src/editldap.c:307 src/editvcard.c:184
-#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:174
+#: src/mimeview.c:206 src/prefs_filter.c:259 src/prefs_folder_item.c:171
 #: src/select-keys.c:319
 msgid "Name"
 msgstr "名稱"
@@ -965,9 +965,9 @@ msgstr "/新增資料夾(_F)"
 #: 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:413 src/summaryview.c:417
-#: src/summaryview.c:420 src/summaryview.c:430 src/summaryview.c:432
-#: src/summaryview.c:434 src/summaryview.c:446 src/summaryview.c:452
+#: src/folderview.c:295 src/summaryview.c:414 src/summaryview.c:418
+#: src/summaryview.c:421 src/summaryview.c:431 src/summaryview.c:433
+#: src/summaryview.c:435 src/summaryview.c:447 src/summaryview.c:453
 msgid "/---"
 msgstr "/---"
 
@@ -976,7 +976,7 @@ msgstr "/---"
 msgid "/_Edit"
 msgstr "/編輯(_E)"
 
-#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:431
+#: src/addressbook.c:385 src/addressbook.c:395 src/summaryview.c:432
 msgid "/_Delete"
 msgstr "/刪除(_D)"
 
@@ -989,7 +989,7 @@ msgid "Address book"
 msgstr "通訊錄"
 
 #: src/addressbook.c:596 src/prefs_filter_edit.c:249
-#: src/prefs_search_folder.c:173
+#: src/prefs_search_folder.c:174
 msgid "Name:"
 msgstr "姓名："
 
@@ -1012,16 +1012,16 @@ msgstr "新增"
 msgid "Lookup"
 msgstr "尋找"
 
-#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:340
+#: src/addressbook.c:646 src/headerview.c:55 src/prefs_folder_item.c:339
 #: src/prefs_template.c:176
 msgid "To:"
 msgstr "收件人"
 
-#: src/addressbook.c:650 src/prefs_folder_item.c:357 src/prefs_template.c:178
+#: src/addressbook.c:650 src/prefs_folder_item.c:356 src/prefs_template.c:178
 msgid "Cc:"
 msgstr "副本"
 
-#: src/addressbook.c:654 src/prefs_folder_item.c:368
+#: src/addressbook.c:654 src/prefs_folder_item.c:367
 msgid "Bcc:"
 msgstr "密件副本"
 
@@ -1043,7 +1043,7 @@ msgstr ""
 "您確定要刪除「%s」資料夾以及裡面所有的地址嗎？\n"
 "如果您選擇只刪除資料夾，裡面的通訊紀錄將移到上一層資料夾中。"
 
-#: src/addressbook.c:1674 src/folderview.c:2346
+#: src/addressbook.c:1674 src/folderview.c:2347
 msgid "Delete folder"
 msgstr "刪除資料夾"
 
@@ -1246,7 +1246,7 @@ msgstr "棕色"
 #. create sub items. for the menu item activation callback we pass the
 #. * color flag value as data parameter. Also we attach a data pointer
 #. * so we can always get back the SummaryView pointer.
-#: src/colorlabel.c:280 src/prefs_folder_item.c:317 src/summaryview.c:4552
+#: src/colorlabel.c:280 src/prefs_folder_item.c:316 src/summaryview.c:4574
 msgid "None"
 msgstr "無"
 
@@ -1337,7 +1337,7 @@ msgid "/_Edit/Aut_o wrapping"
 msgstr "/編輯(_E)/自動折列(_O)"
 
 #: src/compose.c:547 src/mainwindow.c:518 src/messageview.c:151
-#: src/summaryview.c:447
+#: src/summaryview.c:448
 msgid "/_View"
 msgstr "/顯示(_V)"
 
@@ -1567,7 +1567,7 @@ msgid "Can't get the part of multipart message."
 msgstr "無法取得這個附加檔。"
 
 #: src/compose.c:2475 src/headerview.c:195 src/summary_search.c:624
-#: src/summaryview.c:2101
+#: src/summaryview.c:2107
 msgid "(No Subject)"
 msgstr "（沒有主旨）"
 
@@ -1688,7 +1688,7 @@ msgstr "MIME 型態"
 
 #. S_COL_DATE
 #: src/compose.c:4234 src/mimeview.c:197 src/prefs_filter_edit.c:496
-#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4699
+#: src/prefs_summary_column.c:76 src/select-keys.c:317 src/summaryview.c:4721
 msgid "Size"
 msgstr "大小"
 
@@ -1777,7 +1777,7 @@ msgstr "內容"
 msgid "Encoding"
 msgstr "編碼"
 
-#: src/compose.c:5324 src/prefs_folder_item.c:203
+#: src/compose.c:5324 src/prefs_folder_item.c:202
 msgid "Path"
 msgstr "路徑"
 
@@ -1998,12 +1998,12 @@ msgstr "編輯資料夾"
 msgid "Input the new name of folder:"
 msgstr "請輸入新的資料夾名稱："
 
-#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2095
-#: src/folderview.c:2101
+#: src/editgroup.c:525 src/foldersel.c:540 src/folderview.c:2096
+#: src/folderview.c:2102
 msgid "New folder"
 msgstr "新資料夾"
 
-#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2102
+#: src/editgroup.c:526 src/foldersel.c:541 src/folderview.c:2103
 msgid "Input the name of new folder:"
 msgstr "請輸入新資料夾的名稱："
 
@@ -2170,42 +2170,42 @@ msgstr "選擇目錄"
 msgid "Select folder"
 msgstr "選擇資料夾"
 
-#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:236
+#: src/foldersel.c:359 src/folderview.c:1168 src/prefs_folder_item.c:235
 msgid "Inbox"
 msgstr "收件夾"
 
-#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:237
+#: src/foldersel.c:363 src/folderview.c:1174 src/prefs_folder_item.c:236
 msgid "Sent"
 msgstr "寄件夾"
 
-#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:239
+#: src/foldersel.c:367 src/folderview.c:1180 src/prefs_folder_item.c:238
 msgid "Queue"
 msgstr "暫存資料夾"
 
-#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:240
+#: src/foldersel.c:371 src/folderview.c:1186 src/prefs_folder_item.c:239
 msgid "Trash"
 msgstr "刪除的郵件"
 
-#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:238
+#: src/foldersel.c:375 src/folderview.c:1192 src/prefs_folder_item.c:237
 msgid "Drafts"
 msgstr "草稿"
 
-#: src/foldersel.c:542 src/folderview.c:2099 src/folderview.c:2103
+#: src/foldersel.c:542 src/folderview.c:2100 src/folderview.c:2104
 msgid "NewFolder"
 msgstr "新資料夾"
 
-#: src/foldersel.c:550 src/folderview.c:2111 src/folderview.c:2172
+#: src/foldersel.c:550 src/folderview.c:2112 src/folderview.c:2173
 #, c-format
 msgid "`%c' can't be included in folder name."
 msgstr "資料夾名稱中不應含有「%c」這個字元。"
 
-#: src/foldersel.c:560 src/folderview.c:2121 src/folderview.c:2180
+#: src/foldersel.c:560 src/folderview.c:2122 src/folderview.c:2181
 #: src/summary_search.c:984
 #, c-format
 msgid "The folder `%s' already exists."
 msgstr "資料夾「%s」已存在。"
 
-#: src/foldersel.c:568 src/folderview.c:2128
+#: src/foldersel.c:568 src/folderview.c:2129
 #, c-format
 msgid "Can't create the folder `%s'."
 msgstr "無法建立資料夾「%s」。"
@@ -2273,7 +2273,7 @@ msgstr "新的"
 
 #. S_COL_MARK
 #: src/folderview.c:412 src/prefs_filter_edit.c:500
-#: src/prefs_summary_column.c:71 src/summaryview.c:507
+#: src/prefs_summary_column.c:71 src/summaryview.c:509
 msgid "Unread"
 msgstr "未讀的"
 
@@ -2323,22 +2323,22 @@ msgstr "檢查每個資料夾中的新郵件..."
 msgid "Junk"
 msgstr "垃圾郵件"
 
-#: src/folderview.c:1843
+#: src/folderview.c:1844
 #, c-format
 msgid "Folder %s is selected\n"
 msgstr "已選取 %s 資料夾\n"
 
-#: src/folderview.c:1998
+#: src/folderview.c:1999
 #, c-format
 msgid "Downloading messages in %s ..."
 msgstr "從 %s 下載郵件中..."
 
-#: src/folderview.c:2035
+#: src/folderview.c:2036
 #, c-format
 msgid "Error occurred while downloading messages in `%s'."
 msgstr "從 %s 下載郵件時出現錯誤。"
 
-#: src/folderview.c:2096
+#: src/folderview.c:2097
 msgid ""
 "Input the name of new folder:\n"
 "(if you want to create a folder to store subfolders,\n"
@@ -2348,26 +2348,26 @@ msgstr ""
 "（若是資料夾下要有子資料夾，\n"
 "　請在資料夾名稱的後面加上「/'）"
 
-#: src/folderview.c:2160
+#: src/folderview.c:2161
 #, c-format
 msgid "Input new name for `%s':"
 msgstr "請輸入「%s」的新名稱："
 
-#: src/folderview.c:2161
+#: src/folderview.c:2162
 msgid "Rename folder"
 msgstr "重新命名資料夾"
 
-#: src/folderview.c:2192 src/folderview.c:2200
+#: src/folderview.c:2193 src/folderview.c:2201
 #, fuzzy, c-format
 msgid "Can't rename the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2270
+#: src/folderview.c:2271
 #, c-format
 msgid "Can't move the folder `%s'."
 msgstr "無法移動資料夾「%s」。"
 
-#: src/folderview.c:2336
+#: src/folderview.c:2337
 #, fuzzy, c-format
 msgid ""
 "Delete the search folder '%s' ?\n"
@@ -2376,12 +2376,12 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2338
+#: src/folderview.c:2339
 #, fuzzy
 msgid "Delete search folder"
 msgstr "刪除資料夾"
 
-#: src/folderview.c:2343
+#: src/folderview.c:2344
 #, fuzzy, c-format
 msgid ""
 "All folders and messages under '%s' will be permanently deleted.\n"
@@ -2394,20 +2394,20 @@ msgstr ""
 "\n"
 "您確定要刪除它嗎？"
 
-#: src/folderview.c:2375 src/folderview.c:2381
+#: src/folderview.c:2376 src/folderview.c:2382
 #, fuzzy, c-format
 msgid "Can't remove the folder '%s'."
 msgstr "無法移除資料夾「%s」。"
 
-#: src/folderview.c:2417
+#: src/folderview.c:2418
 msgid "Empty trash"
 msgstr "清空刪除的郵件"
 
-#: src/folderview.c:2418
+#: src/folderview.c:2419
 msgid "Delete all messages in the trash folder?"
 msgstr "您確定要清除所有被刪除的郵件？"
 
-#: src/folderview.c:2457
+#: src/folderview.c:2458
 #, c-format
 msgid ""
 "Really remove the mailbox `%s' ?\n"
@@ -2416,34 +2416,34 @@ msgstr ""
 "確定要移除信箱 %s？\n"
 "注意：信箱中的郵件將不會從硬碟中被刪除。"
 
-#: src/folderview.c:2459
+#: src/folderview.c:2460
 msgid "Remove mailbox"
 msgstr "移除信箱"
 
-#: src/folderview.c:2509
+#: src/folderview.c:2510
 #, c-format
 msgid "Really delete IMAP4 account `%s'?"
 msgstr "您確定要刪除 %s 這個 IMAP4 帳號？"
 
-#: src/folderview.c:2510
+#: src/folderview.c:2511
 msgid "Delete IMAP4 account"
 msgstr "刪除 IMAP4 帳號"
 
-#: src/folderview.c:2663
+#: src/folderview.c:2664
 #, c-format
 msgid "Really delete newsgroup `%s'?"
 msgstr "您確定要刪除新聞群組「%s」嗎？"
 
-#: src/folderview.c:2664
+#: src/folderview.c:2665
 msgid "Delete newsgroup"
 msgstr "刪除新聞群組"
 
-#: src/folderview.c:2714
+#: src/folderview.c:2715
 #, c-format
 msgid "Really delete news account `%s'?"
 msgstr "您確定要刪除新聞群組帳號「%s」嗎？"
 
-#: src/folderview.c:2715
+#: src/folderview.c:2716
 msgid "Delete news account"
 msgstr "刪除帳號"
 
@@ -2459,7 +2459,7 @@ msgstr "主旨："
 msgid "Creating header view...\n"
 msgstr "產生標頭視窗...\n"
 
-#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2104
+#: src/headerview.c:180 src/summary_search.c:625 src/summaryview.c:2110
 msgid "(No From)"
 msgstr "（沒有來源）"
 
@@ -3231,7 +3231,7 @@ msgstr "/顯示(_V)/字元編碼(_E)/中文 (ISO-2022-_CN)"
 msgid "/_View/Character _encoding/Korean (ISO-2022-KR)"
 msgstr "/顯示(_V)/字元編碼(_E)/韓文 (ISO-2022-KR)"
 
-#: src/mainwindow.c:688 src/summaryview.c:448
+#: src/mainwindow.c:688 src/summaryview.c:449
 msgid "/_View/Open in new _window"
 msgstr "/顯示(_V)/在新視窗開啟(_W)"
 
@@ -3511,8 +3511,8 @@ msgstr "建立主視窗...\n"
 msgid "MainWindow: color allocation %d failed\n"
 msgstr "主視窗：顏色 %d 配置失敗。\n"
 
-#: src/mainwindow.c:1108 src/summaryview.c:2252 src/summaryview.c:2337
-#: src/summaryview.c:3706 src/summaryview.c:3827 src/summaryview.c:4185
+#: src/mainwindow.c:1108 src/summaryview.c:2258 src/summaryview.c:2343
+#: src/summaryview.c:3720 src/summaryview.c:3849 src/summaryview.c:4207
 msgid "done.\n"
 msgstr "完成。\n"
 
@@ -3585,7 +3585,7 @@ msgstr "Sylpheed - 資料夾檢視"
 msgid "Sylpheed - Message View"
 msgstr "Sylpheed - 郵件列表"
 
-#: src/mainwindow.c:2256 src/summaryview.c:407
+#: src/mainwindow.c:2256 src/summaryview.c:408
 msgid "/_Reply"
 msgstr "/直接回覆(_R)"
 
@@ -3601,15 +3601,15 @@ msgstr "/回覆給原作者(_S)"
 msgid "/Reply to mailing _list"
 msgstr "/回覆到郵遞論壇(_L)"
 
-#: src/mainwindow.c:2264 src/summaryview.c:414
+#: src/mainwindow.c:2264 src/summaryview.c:415
 msgid "/_Forward"
 msgstr "/轉寄(_F)"
 
-#: src/mainwindow.c:2265 src/summaryview.c:415
+#: src/mainwindow.c:2265 src/summaryview.c:416
 msgid "/For_ward as attachment"
 msgstr "/將郵件當成附加檔轉寄(_W)"
 
-#: src/mainwindow.c:2266 src/summaryview.c:416
+#: src/mainwindow.c:2266 src/summaryview.c:417
 msgid "/Redirec_t"
 msgstr "/郵件導向(_T)"
 
@@ -3694,8 +3694,8 @@ msgstr "設定"
 msgid "Common preferences"
 msgstr "一般設定"
 
-#: src/mainwindow.c:2439 src/prefs_folder_item.c:290
-#: src/prefs_folder_item.c:301 src/progressdialog.c:128
+#: src/mainwindow.c:2439 src/prefs_folder_item.c:289
+#: src/prefs_folder_item.c:300 src/progressdialog.c:128
 msgid "Account"
 msgstr "帳號"
 
@@ -3727,7 +3727,7 @@ msgstr "在目前郵件中尋找"
 msgid "Find text:"
 msgstr "尋找文字："
 
-#: src/message_search.c:141 src/prefs_search_folder.c:239
+#: src/message_search.c:141 src/prefs_search_folder.c:240
 #: src/summary_search.c:325
 msgid "Case sensitive"
 msgstr "區分大小寫"
@@ -3772,25 +3772,25 @@ msgstr "附加檔"
 msgid "Message View - Sylpheed"
 msgstr ""
 
-#: src/messageview.c:669 src/summaryview.c:3243
+#: src/messageview.c:669 src/summaryview.c:3249
 #, c-format
 msgid "Can't save the file `%s'."
 msgstr "無法儲存檔案「%s」。"
 
-#: src/messageview.c:728 src/summaryview.c:3266
+#: src/messageview.c:728 src/summaryview.c:3272
 msgid "The message will be printed with the following command:"
 msgstr ""
 
-#: src/messageview.c:729 src/summaryview.c:3267
+#: src/messageview.c:729 src/summaryview.c:3273
 #, fuzzy
 msgid "(Default print command)"
 msgstr "正在學習命令:"
 
-#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3269
+#: src/messageview.c:731 src/prefs_common_dialog.c:2311 src/summaryview.c:3275
 msgid "Print"
 msgstr "列印"
 
-#: src/messageview.c:740 src/summaryview.c:3278
+#: src/messageview.c:740 src/summaryview.c:3284
 #, c-format
 msgid ""
 "Print command line is invalid:\n"
@@ -4160,7 +4160,7 @@ msgstr "送信前先做 POP3 認證"
 msgid "Command output"
 msgstr "命令輸出"
 
-#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:332
+#: src/prefs_account_dialog.c:1235 src/prefs_folder_item.c:331
 msgid "Automatically set the following addresses"
 msgstr "在相關欄位上自動加入下列電子郵件信箱："
 
@@ -5429,7 +5429,7 @@ msgstr "執行結果"
 msgid "Age"
 msgstr "時效"
 
-#: src/prefs_filter_edit.c:501 src/summaryview.c:508
+#: src/prefs_filter_edit.c:501 src/summaryview.c:510
 #, fuzzy
 msgid "Marked"
 msgstr "標記"
@@ -5594,35 +5594,35 @@ msgstr "指定的指令不存在。"
 msgid "Folder properties"
 msgstr "資料夾屬性"
 
-#: src/prefs_folder_item.c:187
+#: src/prefs_folder_item.c:186
 msgid "Identifier"
 msgstr "識別符號"
 
-#: src/prefs_folder_item.c:219 src/subscribedialog.c:294
+#: src/prefs_folder_item.c:218 src/subscribedialog.c:294
 msgid "Type"
 msgstr "MIME 型態"
 
-#: src/prefs_folder_item.c:235
+#: src/prefs_folder_item.c:234
 msgid "Normal"
 msgstr "正常"
 
-#: src/prefs_folder_item.c:248
+#: src/prefs_folder_item.c:247
 msgid "Don't display [...] or (...) at the beginning of subject in summary"
 msgstr "在郵件列表中不要顯示郵件主旨前面的中括號 [] 或小括號 ()"
 
-#: src/prefs_folder_item.c:250
+#: src/prefs_folder_item.c:249
 msgid "Delete [...] or (...) at the beginning of subject on reply"
 msgstr "回覆時刪除郵件主旨前面的中括號 [] 或小括號 ()"
 
-#: src/prefs_folder_item.c:330
+#: src/prefs_folder_item.c:329
 msgid "Apply to subfolders"
 msgstr "套用到子資料夾"
 
-#: src/prefs_folder_item.c:355
+#: src/prefs_folder_item.c:354
 msgid "use also on reply"
 msgstr "回覆郵件時也使用"
 
-#: src/prefs_folder_item.c:379
+#: src/prefs_folder_item.c:378
 msgid "Reply-To:"
 msgstr "回信地址："
 
@@ -5631,20 +5631,20 @@ msgstr "回信地址："
 msgid "%s - Edit search condition"
 msgstr ""
 
-#: src/prefs_search_folder.c:195 src/summary_search.c:256
+#: src/prefs_search_folder.c:196 src/summary_search.c:256
 msgid "Match any of the following"
 msgstr "下列任一條件符合"
 
-#: src/prefs_search_folder.c:197 src/summary_search.c:258
+#: src/prefs_search_folder.c:198 src/summary_search.c:258
 msgid "Match all of the following"
 msgstr "下列所有條件均符合"
 
-#: src/prefs_search_folder.c:217 src/summary_search.c:302
+#: src/prefs_search_folder.c:218 src/summary_search.c:302
 #, fuzzy
 msgid "Folder:"
 msgstr "資料夾"
 
-#: src/prefs_search_folder.c:234 src/summary_search.c:320
+#: src/prefs_search_folder.c:235 src/summary_search.c:320
 #, fuzzy
 msgid "Search subfolders"
 msgstr "搜尋失敗"
@@ -5660,19 +5660,19 @@ msgstr "附加檔案"
 
 #. S_COL_MIME
 #: src/prefs_summary_column.c:73 src/summary_search.c:370
-#: src/summaryview.c:4692
+#: src/summaryview.c:4714
 msgid "Subject"
 msgstr "主旨"
 
 #. S_COL_SUBJECT
 #: src/prefs_summary_column.c:74 src/summary_search.c:371
-#: src/summaryview.c:4695
+#: src/summaryview.c:4717
 msgid "From"
 msgstr "來源"
 
 #. S_COL_FROM
 #: src/prefs_summary_column.c:75 src/summary_search.c:372
-#: src/summaryview.c:4697
+#: src/summaryview.c:4719
 msgid "Date"
 msgstr "日期"
 
@@ -6065,7 +6065,7 @@ msgstr "無法取得收件人或收件新聞群組名單。"
 msgid "Can't retrieve newsgroup list."
 msgstr "無法取得收件人或收件新聞群組名單。"
 
-#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:834
+#: src/subscribedialog.c:523 src/summary_search.c:502 src/summaryview.c:840
 msgid "Done."
 msgstr "完成"
 
@@ -6093,7 +6093,7 @@ msgstr "掃描資料夾 %s ..."
 msgid "Searching %s (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summary_search.c:633 src/summaryview.c:2042
+#: src/summary_search.c:633 src/summaryview.c:2048
 msgid "(No Date)"
 msgstr "(沒有日期)"
 
@@ -6111,346 +6111,350 @@ msgstr ""
 msgid "Folder name:"
 msgstr "檔名"
 
-#: src/summaryview.c:408
+#: src/summaryview.c:409
 msgid "/Repl_y to"
 msgstr "/回覆給(_Y)"
 
-#: src/summaryview.c:409
+#: src/summaryview.c:410
 msgid "/Repl_y to/_all"
 msgstr "/回覆給(_Y)/所有收件人(_A)"
 
-#: src/summaryview.c:410
+#: src/summaryview.c:411
 msgid "/Repl_y to/_sender"
 msgstr "/回覆給(_Y)/原作者(_S)"
 
-#: src/summaryview.c:411
+#: src/summaryview.c:412
 msgid "/Repl_y to/mailing _list"
 msgstr "/回覆給(_Y)/郵遞論壇(_L)"
 
-#: src/summaryview.c:418
+#: src/summaryview.c:419
 msgid "/M_ove..."
 msgstr "/移動(_O)..."
 
-#: src/summaryview.c:419
+#: src/summaryview.c:420
 msgid "/_Copy..."
 msgstr "/複製(_C)..."
 
-#: src/summaryview.c:421
+#: src/summaryview.c:422
 msgid "/_Mark"
 msgstr "/標記(_M)"
 
-#: src/summaryview.c:422
+#: src/summaryview.c:423
 msgid "/_Mark/_Mark"
 msgstr "/標記(_M)/標記(_M)"
 
-#: src/summaryview.c:423
+#: src/summaryview.c:424
 msgid "/_Mark/_Unmark"
 msgstr "/標記(_M)/去除標記(_U)"
 
-#: src/summaryview.c:424
+#: src/summaryview.c:425
 msgid "/_Mark/---"
 msgstr "/標記(_M)/---"
 
-#: src/summaryview.c:425
+#: src/summaryview.c:426
 msgid "/_Mark/Mark as unr_ead"
 msgstr "/標記(_M)/標記成未讀(_E)"
 
-#: src/summaryview.c:426
+#: src/summaryview.c:427
 msgid "/_Mark/Mark as rea_d"
 msgstr "/標記(_M)/標記成已讀(_D)"
 
-#: src/summaryview.c:428
+#: src/summaryview.c:429
 msgid "/_Mark/Mark all _read"
 msgstr "/標記(_M)/標記所有郵件成已讀(_R)"
 
-#: src/summaryview.c:429
+#: src/summaryview.c:430
 msgid "/Color la_bel"
 msgstr "/以顏色做標記(_B)"
 
-#: src/summaryview.c:433
+#: src/summaryview.c:434
 msgid "/Re-_edit"
 msgstr "/重新編輯(_E)"
 
-#: src/summaryview.c:435
+#: src/summaryview.c:436
 msgid "/Add sender to address boo_k..."
 msgstr "/將寄信人加入通訊錄(_K)..."
 
-#: src/summaryview.c:437
+#: src/summaryview.c:438
 msgid "/Create f_ilter rule"
 msgstr "/產生郵件過濾規則(_I)"
 
-#: src/summaryview.c:438
+#: src/summaryview.c:439
 msgid "/Create f_ilter rule/_Automatically"
 msgstr "/產生郵件過濾規則(_I)/自動產生(_A)"
 
-#: src/summaryview.c:440
+#: src/summaryview.c:441
 msgid "/Create f_ilter rule/by _From"
 msgstr "/產生郵件過濾規則(_I)/依來源(_F)"
 
-#: src/summaryview.c:442
+#: src/summaryview.c:443
 msgid "/Create f_ilter rule/by _To"
 msgstr "/產生郵件過濾規則(_I)/依收信人(_T)"
 
-#: src/summaryview.c:444
+#: src/summaryview.c:445
 msgid "/Create f_ilter rule/by _Subject"
 msgstr "/產生郵件過濾規則(_I)/依主旨(_S)"
 
-#: src/summaryview.c:450
+#: src/summaryview.c:451
 msgid "/_View/_Source"
 msgstr "/顯示(_V)/觀看郵件原始碼(_S)"
 
-#: src/summaryview.c:451
+#: src/summaryview.c:452
 msgid "/_View/All _header"
 msgstr "/顯示(_V)/顯示所有的標頭(_H)"
 
-#: src/summaryview.c:453
+#: src/summaryview.c:454
 msgid "/_Print..."
 msgstr "/列印(_P)..."
 
-#: src/summaryview.c:484
+#: src/summaryview.c:486
 msgid "Creating summary view...\n"
 msgstr "正在建立彙總檢視...\n"
 
-#: src/summaryview.c:506
+#: src/summaryview.c:508
 msgid "All"
 msgstr ""
 
-#: src/summaryview.c:509
+#: src/summaryview.c:511
 #, fuzzy
 msgid "Have color label"
 msgstr "/以顏色做標記(_B)"
 
-#: src/summaryview.c:510
+#: src/summaryview.c:512
 #, fuzzy
 msgid "Have attachment"
 msgstr "附加檔案"
 
-#: src/summaryview.c:519
+#: src/summaryview.c:521
 #, fuzzy
 msgid "Search:"
 msgstr "尋找"
 
-#: src/summaryview.c:696
+#: src/summaryview.c:535
+msgid "Search for Subject or From"
+msgstr ""
+
+#: src/summaryview.c:702
 msgid "Process mark"
 msgstr "郵件標記"
 
-#: src/summaryview.c:697
+#: src/summaryview.c:703
 msgid "Some marks are left. Process it?"
 msgstr "某些郵件已被標記。要繼續嗎？"
 
-#: src/summaryview.c:743
+#: src/summaryview.c:749
 #, c-format
 msgid "Scanning folder (%s)..."
 msgstr "掃描資料夾 (%s)..."
 
-#: src/summaryview.c:1286
+#: src/summaryview.c:1292
 msgid "_Search again"
 msgstr "再次搜尋(_S)"
 
-#: src/summaryview.c:1307 src/summaryview.c:1316
+#: src/summaryview.c:1313 src/summaryview.c:1322
 msgid "No more unread messages"
 msgstr "沒有其他未讀郵件"
 
-#: src/summaryview.c:1308
+#: src/summaryview.c:1314
 msgid "No unread message found. Search from the end?"
 msgstr "沒有找到未讀郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1310
+#: src/summaryview.c:1316
 msgid "No unread messages."
 msgstr "沒有未讀郵件。"
 
-#: src/summaryview.c:1317
+#: src/summaryview.c:1323
 msgid "No unread message found. Go to next folder?"
 msgstr "沒有未讀郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1325 src/summaryview.c:1334
+#: src/summaryview.c:1331 src/summaryview.c:1340
 msgid "No more new messages"
 msgstr "沒有其他新郵件"
 
-#: src/summaryview.c:1326
+#: src/summaryview.c:1332
 msgid "No new message found. Search from the end?"
 msgstr "沒有找到新郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1328
+#: src/summaryview.c:1334
 msgid "No new messages."
 msgstr "沒有新郵件。"
 
-#: src/summaryview.c:1335
+#: src/summaryview.c:1341
 msgid "No new message found. Go to next folder?"
 msgstr "沒有新郵件。要到下一個資料夾嗎？"
 
-#: src/summaryview.c:1343 src/summaryview.c:1352
+#: src/summaryview.c:1349 src/summaryview.c:1358
 msgid "No more marked messages"
 msgstr "沒有其他已標記郵件"
 
-#: src/summaryview.c:1344
+#: src/summaryview.c:1350
 msgid "No marked message found. Search from the end?"
 msgstr "沒有找到已標記郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1346 src/summaryview.c:1355
+#: src/summaryview.c:1352 src/summaryview.c:1361
 msgid "No marked messages."
 msgstr "沒有已標記郵件。"
 
-#: src/summaryview.c:1353
+#: src/summaryview.c:1359
 msgid "No marked message found. Search from the beginning?"
 msgstr "沒有找到已標記郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1361 src/summaryview.c:1370
+#: src/summaryview.c:1367 src/summaryview.c:1376
 msgid "No more labeled messages"
 msgstr "沒有已標記顏色之郵件"
 
-#: src/summaryview.c:1362
+#: src/summaryview.c:1368
 msgid "No labeled message found. Search from the end?"
 msgstr "沒有找到已標記顏色之郵件。要從尾部繼續搜尋嗎？"
 
-#: src/summaryview.c:1364 src/summaryview.c:1373
+#: src/summaryview.c:1370 src/summaryview.c:1379
 msgid "No labeled messages."
 msgstr "沒有已標記顏色之郵件。"
 
-#: src/summaryview.c:1371
+#: src/summaryview.c:1377
 msgid "No labeled message found. Search from the beginning?"
 msgstr "沒有找到已標記顏色之郵件。要從開頭繼續搜尋嗎？"
 
-#: src/summaryview.c:1687
+#: src/summaryview.c:1693
 msgid "Attracting messages by subject..."
 msgstr "依主旨展開郵件中..."
 
-#: src/summaryview.c:1881
+#: src/summaryview.c:1887
 #, c-format
 msgid "%d deleted"
 msgstr "%d 已刪除"
 
-#: src/summaryview.c:1885
+#: src/summaryview.c:1891
 #, c-format
 msgid "%s%d moved"
 msgstr "%s%d 已移動"
 
-#: src/summaryview.c:1886 src/summaryview.c:1891
+#: src/summaryview.c:1892 src/summaryview.c:1897
 msgid ", "
 msgstr "， "
 
-#: src/summaryview.c:1890
+#: src/summaryview.c:1896
 #, c-format
 msgid "%s%d copied"
 msgstr "%s%d 已複製"
 
-#: src/summaryview.c:1905
+#: src/summaryview.c:1911
 msgid " item(s) selected"
 msgstr " 封已選擇"
 
-#: src/summaryview.c:1927
+#: src/summaryview.c:1933
 #, c-format
 msgid "%d new, %d unread, %d total (%s)"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封(%s)"
 
-#: src/summaryview.c:1931
+#: src/summaryview.c:1937
 #, c-format
 msgid "%d new, %d unread, %d total"
 msgstr "%d 封未讀，%d 封已讀，共 %d 封"
 
-#: src/summaryview.c:1965
+#: src/summaryview.c:1971
 msgid "Sorting summary..."
 msgstr "郵件排序中..."
 
-#: src/summaryview.c:2188
+#: src/summaryview.c:2194
 msgid "\tSetting summary from message data..."
 msgstr "\t產生郵件列表中..."
 
-#: src/summaryview.c:2190
+#: src/summaryview.c:2196
 msgid "Setting summary from message data..."
 msgstr "產生郵件列表中..."
 
-#: src/summaryview.c:2296
+#: src/summaryview.c:2302
 #, c-format
 msgid "Writing summary cache (%s)..."
 msgstr "寫入列表快取 (%s)..."
 
-#: src/summaryview.c:2637
+#: src/summaryview.c:2643
 #, c-format
 msgid "Message %d is marked\n"
 msgstr "郵件 %d 已標記\n"
 
-#: src/summaryview.c:2695
+#: src/summaryview.c:2701
 #, c-format
 msgid "Message %d is marked as being read\n"
 msgstr "郵件 %d 已標記成已讀\n"
 
-#: src/summaryview.c:2783
+#: src/summaryview.c:2789
 #, c-format
 msgid "Message %d is marked as unread\n"
 msgstr "郵件 %d 已標記成未讀\n"
 
-#: src/summaryview.c:2844
+#: src/summaryview.c:2850
 #, c-format
 msgid "Message %s/%d is set to delete\n"
 msgstr "郵件 %s/%d 已標記刪除\n"
 
-#: src/summaryview.c:2862
+#: src/summaryview.c:2868
 msgid "Delete message(s)"
 msgstr "刪除郵件"
 
-#: src/summaryview.c:2863
+#: src/summaryview.c:2869
 msgid "Do you really want to delete message(s) from the trash?"
 msgstr "您確定要從刪除的郵件資料夾中刪除這封郵件嗎？"
 
-#: src/summaryview.c:2928
+#: src/summaryview.c:2934
 msgid "Deleting duplicated messages..."
 msgstr "刪除重覆的郵件..."
 
-#: src/summaryview.c:2966
+#: src/summaryview.c:2972
 #, c-format
 msgid "Message %s/%d is unmarked\n"
 msgstr "郵件 %s/%d 已消除標記\n"
 
-#: src/summaryview.c:3024
+#: src/summaryview.c:3030
 #, c-format
 msgid "Message %d is set to move to %s\n"
 msgstr "郵件 %d 已設定移動到 %s\n"
 
-#: src/summaryview.c:3041
+#: src/summaryview.c:3047
 msgid "Destination is same as current folder."
 msgstr "目標資料夾與來源資料夾相同。"
 
-#: src/summaryview.c:3097
+#: src/summaryview.c:3103
 #, c-format
 msgid "Message %d is set to copy to %s\n"
 msgstr "郵件 %d 已設定複製到 %s\n"
 
-#: src/summaryview.c:3114
+#: src/summaryview.c:3120
 msgid "Destination for copy is same as current folder."
 msgstr "郵件無法複製到同一個資料夾內。"
 
-#: src/summaryview.c:3313
+#: src/summaryview.c:3319
 msgid "Error occurred while processing messages."
 msgstr "處理郵件時發生錯誤。"
 
-#: src/summaryview.c:3621 src/summaryview.c:3622
+#: src/summaryview.c:3627 src/summaryview.c:3628
 msgid "Building threads..."
 msgstr "產生郵件串列中..."
 
-#: src/summaryview.c:3764 src/summaryview.c:3765
+#: src/summaryview.c:3778 src/summaryview.c:3779
 msgid "Unthreading..."
 msgstr "解除郵件串列中..."
 
-#: src/summaryview.c:4050 src/summaryview.c:4106
+#: src/summaryview.c:4072 src/summaryview.c:4128
 #, fuzzy, c-format
 msgid "Filtering (%d / %d)..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4155
+#: src/summaryview.c:4177
 msgid "filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4156
+#: src/summaryview.c:4178
 msgid "Filtering..."
 msgstr "過濾中..."
 
-#: src/summaryview.c:4192
+#: src/summaryview.c:4214
 #, c-format
 msgid "%d message(s) have been filtered."
 msgstr "已過濾 %d 封郵件"
 
-#: src/summaryview.c:4701
+#: src/summaryview.c:4723
 msgid "No."
 msgstr "No."
 
@@ -6522,12 +6526,12 @@ msgstr "/郵件(_M)/接收(_V)/從所有帳號中接收新郵件(_A)"
 msgid "_Send queued messages"
 msgstr "將暫存資料夾中的郵件送出"
 
-#: src/trayicon.c:114
+#: src/trayicon.c:115
 #, fuzzy
 msgid "_About"
 msgstr "關於"
 
-#: src/trayicon.c:117
+#: src/trayicon.c:119
 #, fuzzy
 msgid "E_xit"
 msgstr "離開"
author	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2006-01-20 06:11:52 +0000
committer	hiro <hiro@ee746299-78ed-0310-b773-934348b2243d>	2006-01-20 06:11:52 +0000
commit	6461df31b433aa0204fbd3e030351437827e65f6 (patch)
tree	aa7e81eb3419b1a3ddc78232232484ed7cfdaa7e /po
parent	d004f1f314aca46c379c86e6e587e0918cc2cf36 (diff)